[minion-cvs] Make latest patch run; fix type errors

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/minion/cvsroot/src/minion/lib/mixminion/server
In directory moria.mit.edu:/tmp/cvs-serv21144/lib/mixminion/server

Modified Files:
	Pinger.py ServerMain.py 
Log Message:
Make latest patch run; fix type errors

Index: Pinger.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/Pinger.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Pinger.py	20 Dec 2004 04:16:21 -0000	1.20
+++ Pinger.py	20 Dec 2004 05:07:26 -0000	1.21
@@ -985,8 +985,8 @@
     def __init__(self, config):
         PingGenerator.__init__(self, config)
         _PingScheduler.__init__(self)
-        self._ping_interval = config['Pinging']['ServerPingPeriod']
-        self._period_length = self._calcPeriodLen(self._pingInterval)
+        self._ping_interval = config['Pinging']['ServerPingPeriod'].getSeconds()
+        self._period_length = self._calcPeriodLen(self._ping_interval)
 
     def scheduleAllPings(self, now=None):
         if now is None: now = int(time.time())
@@ -1031,8 +1031,8 @@
     def __init__(self, config):
         PingGenerator.__init__(self, config)
         _PingScheduler.__init__(self)
-        self._dull_interval = self['Pinging']['DullChainPingPeriod'].getSeconds()
-        self._interesting_interval = self['Pinging']['ChainPingPeriod'].getSeconds()
+        self._dull_interval = config['Pinging']['DullChainPingPeriod'].getSeconds()
+        self._interesting_interval = config['Pinging']['ChainPingPeriod'].getSeconds()
         self._period_length = self._calcPeriodLen(
             max(self._interesting_interval,self._dull_interval))
 

Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- ServerMain.py	20 Dec 2004 04:16:21 -0000	1.142
+++ ServerMain.py	20 Dec 2004 05:07:26 -0000	1.143
@@ -1122,8 +1122,8 @@
         self.moduleManager.cleanQueues(df)
         if self.pingLog:
             now = time.time()
-            self.pingLog.rotate(now-self.config['Pinging']['RetainData'],
-                                now-self.config['Pinging']['RetainResults'])
+            self.pingLog.rotate(now-self.config['Pinging']['RetainData'].getSeconds(),
+                                now-self.config['Pinging']['RetainResults'].getSeconds())
 
     def close(self):
         """Release all resources; close all files."""