Apply the same cache as in CMFActivity.ActivityTool to getCurrentNode method.

Reorder test to execute less costly operations first.
Use accessor to get alarmNode value.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@18753 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/Tool/AlarmTool.py

@@ -54,6 +54,7 @@ except ImportError:
 
 last_tic = time.time()
 last_tic_lock = threading.Lock()
+current_node = None
 
 class AlarmTool(BaseTool):
   """
@@ -193,8 +194,9 @@ class AlarmTool(BaseTool):
       in zope.conf. The Default is every 5 seconds.
     """
     # only start when we are the alarmNode or if it's empty
-    if (self.alarmNode == self.getCurrentNode()) \
-      or not self.alarmNode:
+    alarmNode = self.getAlarmNode()
+    if (not alarmNode) \
+      or (alarmNode == self.getCurrentNode()):
       global last_tic
       last_tic_lock.acquire(1)
       try:
@@ -206,6 +208,8 @@ class AlarmTool(BaseTool):
 
   def getCurrentNode(self):
       """ Return current node in form ip:port """
+      global current_node
+      if current_node is None:
         port = ''
         from asyncore import socket_map
         for k, v in socket_map.items():
@@ -216,8 +220,8 @@ class AlarmTool(BaseTool):
                     port = v.port
                     break
         ip = socket.gethostbyname(socket.gethostname())
-      currentNode = '%s:%s' %(ip, port)
-      return currentNode
+        current_node = '%s:%s' %(ip, port)
+      return current_node
       
   security.declarePublic('getAlarmNode')
   def getAlarmNode(self):