[minion-cvs] Last code tweaks before v001

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ServerMain.py 
Log Message:
Last code tweaks before v001

Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ServerMain.py	15 Dec 2002 05:55:30 -0000	1.4
+++ ServerMain.py	16 Dec 2002 01:37:21 -0000	1.5
@@ -264,7 +264,7 @@
 	f.close()
 
 	now = time.time()
-	MIX_INTERVAL = 20  # FFFF Configurable!
+	MIX_INTERVAL = 600  # FFFF Configurable!
 	nextMix = now + MIX_INTERVAL
 	nextShred = now + 6000
 	#FFFF Unused
@@ -359,11 +359,10 @@
 	mixminion.Crypto.init_crypto(config)
 
 	server = MixminionServer(config)
-	
     except:
-	LOG.fatal_exc(sys.exc_info(),"Exception while configuring server")
-	print >>sys.stderr, "Shutting down because of exception"
-	#XXXX001 Print the exception, too.
+	info = sys.exc_info()
+	LOG.fatal_exc(info,"Exception while configuring server")
+	print >>sys.stderr, "Shutting down because of exception: %s"%info[1]
 	sys.exit(1)
 
     if not config['Server'].get("NoDaemon",0):
@@ -384,8 +383,9 @@
     except KeyboardInterrupt:
 	pass
     except:
-	LOG.fatal_exc(sys.exc_info(),"Exception while running server")
-	#XXXX001 Print the exception, too.
+	info = sys.exc_info()
+	LOG.fatal_exc(info,"Exception while running server")
+	print >>sys.stderr, "Shutting down because of exception: %s"%info[1]
     LOG.info("Server shutting down")
     server.close()
     LOG.info("Server is shut down")