Changeset 2450

Timestamp:

09/16/05 20:52:18 (19 years ago)

Author:

jerome

Message:

Now deleted entries are flushed from the cache.
Modified entries are kept in the cache since we modify the attributes
by software anyway.

Location:

pykota/trunk

Files:

• pykota/storage.py (modified) (7 diffs)
• TODO (modified) (1 diff)

pykota/trunk/pykota/storage.py

@@ -99 +99 @@
         else :    
             self.parent.commitTransaction()
+            self.parent.flushEntry("USERS", self.Name)
             self.Exists = 0
         
@@ -130 +131 @@
         else :    
             self.parent.commitTransaction()
+            self.parent.flushEntry("GROUPS", self.Name)
             self.Exists = 0
         
@@ -196 +198 @@
         else :    
             self.parent.commitTransaction()
+            self.parent.flushEntry("PRINTERS", self.Name)
             self.Exists = 0    
         
@@ -358 +361 @@
     def setDateLimit(self, datelimit) :    
         """Sets the date limit for this quota."""
-        date = "%04i-%02i-%02i %02i:%02i:%02i" % (datelimit.year, datelimit.month, datelimit.day, datelimit.hour, datelimit.minute, datelimit.second)
+        date = "%04i-%02i-%02i %02i:%02i:%02i" % (datelimit.year, \
+                                                  datelimit.month, \
+                                                  datelimit.day, \
+                                                  datelimit.hour, \
+                                                  datelimit.minute, \
+                                                  datelimit.second)
         self.parent.writeGroupPQuotaDateLimit(self, date)
         self.DateLimit = date
@@ -421 +429 @@
         """Deletes the billing code from the database."""
         self.parent.deleteBillingCode(self)
+        self.parent.flushEntry("BILLINGCODES", self.BillingCode)
         self.Exists = 0
         
@@ -456 +465 @@
         if self.usecache :
             self.tool.logdebug("Caching enabled.")
-            self.caches = { "USERS" : {}, "GROUPS" : {}, "PRINTERS" : {}, "USERPQUOTAS" : {}, "GROUPPQUOTAS" : {}, "JOBS" : {}, "LASTJOBS" : {}, "BILLINGCODES" : {} }
+            self.caches = { "USERS" : {}, \
+                            "GROUPS" : {}, \
+                            "PRINTERS" : {}, \
+                            "USERPQUOTAS" : {}, \
+                            "GROUPPQUOTAS" : {}, \
+                            "JOBS" : {}, \
+                            "LASTJOBS" : {}, \
+                            "BILLINGCODES" : {} }
         
     def close(self) :    
@@ -481 +497 @@
             self.caches[cachetype][key] = value
             self.tool.logdebug("Cache store (%s->%s)" % (cachetype, key))
+            
+    def flushEntry(self, cachetype, key) :        
+        """Removes an entry from the cache."""
+        if self.usecache :
+            try :
+                del self.caches[cachetype][key]
+            except KeyError :    
+                pass
+            else :    
+                self.tool.logdebug("Cache flush (%s->%s)" % (cachetype, key))
             
     def getUser(self, username) :        

pykota/trunk/TODO

@@ -38 +38 @@
         - Make the SNMP and PJL delay and number of loops a new configuration
           directive.
-        
-        - Ensure that deleted or modified entries are flushed from the cache.
         
         - Adds configurability to what happens when the user/group doesn't exist