fix: no need for purging the expired

Author: fstagni

src/DIRAC/Core/Utilities/DictCache.py

@@ -27,7 +27,6 @@ class MockLockRing:
 
     def doNothing(self, *args, **kwargs):
         """Really does nothing !"""
-        pass
 
     acquire = release = doNothing
 
@@ -105,9 +104,9 @@ def exists(self, cKey, validSeconds=0):
                 # If it's valid return True!
                 if expTime > datetime.datetime.now() + datetime.timedelta(seconds=validSeconds):
                     return True
-                else:
-                    # Delete expired
-                    self.delete(cKey)
+
+                # Delete expired
+                self.delete(cKey)
             return False
         finally:
             self.lock.release()
@@ -159,9 +158,9 @@ def get(self, cKey, validSeconds=0):
                 # If it's valid return True!
                 if expTime > datetime.datetime.now() + datetime.timedelta(seconds=validSeconds):
                     return self.__cache[cKey]["value"]
-                else:
-                    # Delete expired
-                    self.delete(cKey)
+
+                # Delete expired
+                self.delete(cKey)
             return None
         finally:
             self.lock.release()
@@ -174,11 +173,11 @@ def showContentsInString(self):
         self.lock.acquire()
         try:
             data = []
-            for cKey in self.__cache:
-                data.append("%s:" % str(cKey))
-                data.append("\tExp: %s" % self.__cache[cKey]["expirationTime"])
-                if self.__cache[cKey]["value"]:
-                    data.append("\tVal: %s" % self.__cache[cKey]["value"])
+            for cKey, cValue in self.__cache.items():
+                data.append(f"{cKey}:")
+                data.append(f"\tExp: {cValue['expirationTime']}")
+                if cValue["value"]:
+                    data.append(f"\tVal: {cValue['Value']}")
             return "\n".join(data)
         finally:
             self.lock.release()
@@ -194,8 +193,8 @@ def getKeys(self, validSeconds=0):
         try:
             keys = []
             limitTime = datetime.datetime.now() + datetime.timedelta(seconds=validSeconds)
-            for cKey in self.__cache:
-                if self.__cache[cKey]["expirationTime"] > limitTime:
+            for cKey, cValue in self.__cache.items():
+                if cValue["expirationTime"] > limitTime:
                     keys.append(cKey)
             return keys
         finally:
@@ -210,13 +209,13 @@ def purgeExpired(self, expiredInSeconds=0):
         try:
             keys = []
             limitTime = datetime.datetime.now() + datetime.timedelta(seconds=expiredInSeconds)
-            for cKey in self.__cache:
-                if self.__cache[cKey]["expirationTime"] < limitTime:
+            for cKey, cValue in self.__cache.items():
+                if cValue["expirationTime"] < limitTime:
                     keys.append(cKey)
-            for cKey in keys:
+            for key in keys:
                 if self.__deleteFunction:
-                    self.__deleteFunction(self.__cache[cKey]["value"])
-                del self.__cache[cKey]
+                    self.__deleteFunction(self.__cache[key]["value"])
+                del self.__cache[key]
         finally:
             self.lock.release()
 

src/DIRAC/FrameworkSystem/Service/BundleDeliveryHandler.py

@@ -83,11 +83,15 @@ def updateBundles(self):
 class BundleDeliveryHandlerMixin:
     @classmethod
     def initializeHandler(cls, serviceInfoDict):
+
+        ## FIXME: move to an agent
         csPath = serviceInfoDict["serviceSectionPath"]
         cls.bundleManager = BundleManager(csPath)
         updateBundleTime = gConfig.getValue("%s/BundlesLifeTime" % csPath, 3600 * 6)
         gLogger.info("Bundles will be updated each %s secs" % updateBundleTime)
         gThreadScheduler.addPeriodicTask(updateBundleTime, cls.bundleManager.updateBundles)
+        ##
+
         return S_OK()
 
     types_getListOfBundles = []

src/DIRAC/FrameworkSystem/Service/NotificationHandler.py

@@ -12,25 +12,28 @@
     It can also be used to set alarms to be promptly forwarded to those
     subscribing to them.
 """
-from DIRAC import gConfig, S_OK, S_ERROR
-
+from DIRAC import S_ERROR, S_OK, gConfig
+from DIRAC.ConfigurationSystem.Client import PathFinder
 from DIRAC.Core.DISET.RequestHandler import RequestHandler
+from DIRAC.Core.Security import Properties
+from DIRAC.Core.Utilities.DictCache import DictCache
 from DIRAC.Core.Utilities.Mail import Mail
 from DIRAC.Core.Utilities.ThreadScheduler import gThreadScheduler
-from DIRAC.Core.Security import Properties
-from DIRAC.ConfigurationSystem.Client import PathFinder
 from DIRAC.FrameworkSystem.DB.NotificationDB import NotificationDB
-from DIRAC.Core.Utilities.DictCache import DictCache
 
 
 class NotificationHandlerMixin:
     @classmethod
     def initializeHandler(cls, serviceInfo):
         """Handler initialization"""
-        cls.notDB = NotificationDB()
+
         cls.mailCache = DictCache()
+        cls.notDB = NotificationDB()
+
+        ## FIXME: move to an agent
         gThreadScheduler.addPeriodicTask(3600, cls.notDB.purgeExpiredNotifications)
-        gThreadScheduler.addPeriodicTask(3600, cls.mailCache.purgeExpired())
+        ##
+
         return S_OK()
 
     def initialize(self):