[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[minion-cvs] Apply pinger patch from Tobias; pingers may work now.



Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria:/tmp/cvs-serv24337/lib/mixminion/server

Modified Files:
	Pinger.py 
Log Message:
Apply pinger patch from Tobias; pingers may work now.

Index: Pinger.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/Pinger.py,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- Pinger.py	10 Nov 2005 02:17:09 -0000	1.30
+++ Pinger.py	2 Nov 2007 03:41:09 -0000	1.31
@@ -1193,6 +1193,7 @@
         assert (path2[-1].getIdentityDigest() ==
                 self.keyring.getIdentityKeyDigest())
         try:
+            LOG.debug("Pinger checking path %s",",".join([s.getNickname() for s in (path1+path2[:-1])]))
             p1 = self.directory.getPath(path1)
             p2 = self.directory.getPath(path2)
         except UIError, e:
@@ -1259,7 +1260,6 @@
         if now is None: now = int(time.time())
         periodStart = self._getPeriodStart(now)
         periodEnd = periodStart + self._period_length
-        path = tuple([ p.lower() for p in path ])
 
         interval = self._getPingInterval(path)
         perturbation = self._getPerturbation(path, periodStart, interval)
@@ -1410,6 +1410,7 @@
                 when = self.nextPingTime.get((id1,id2))
                 if when is None:
                     # No ping scheduled; server must be new to directory.
+                    LOG.debug("No ping scheduled; server must be new to directory.")
                     self._schedulePing((id1,id2),now)
                     continue
                 elif when > now: # Not yet.