[minion-cvs] Make shutdown work again. (We needed a way to say "shu...

[nickm@xxxxxxxx (Nick Mathewson)]

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

Modified Files:
	ServerMain.py 
Log Message:
Make shutdown work again.  (We needed a way to say "shut down the database thread once it is finished with what it is doing.)

Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- ServerMain.py	12 Dec 2004 23:24:31 -0000	1.140
+++ ServerMain.py	13 Dec 2004 01:06:43 -0000	1.141
@@ -1006,7 +1006,7 @@
             # FFFF still want this to happen in another thread.
             #XXXX008 use symbolic constants here
             self.scheduleEvent(RecurringEvent(
-                now+3*60,
+                now+1*60, #3*60
                 lambda self=self: self.pingLog.calculateAll(
                  os.path.join(self.config.getWorkDir(), "pinger", "status")),
                 #1*60*60))
@@ -1132,7 +1132,7 @@
         self.cleaningThread.shutdown()
         self.processingThread.shutdown()
         self.moduleManager.shutdown()
-        if self.databaseThread: self.databaseThread.shutdown()
+        if self.databaseThread: self.databaseThread.shutdown(flush=0)
 
         self.cleaningThread.join()
         self.processingThread.join()