[minion-cvs] Make some comments more accurate

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ServerConfig.py ServerMain.py 
Log Message:
Make some comments more accurate

Index: ServerConfig.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerConfig.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- ServerConfig.py	3 Jan 2003 05:14:47 -0000	1.7
+++ ServerConfig.py	5 Jan 2003 01:30:20 -0000	1.8
@@ -184,5 +184,4 @@
         # FFFF Missing: Queue-Size / Queue config options
         # FFFF         listen timeout??
         # FFFF         Retry options
-        # FFFF         pool options
         }

Index: ServerMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/ServerMain.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ServerMain.py	31 Dec 2002 04:38:00 -0000	1.13
+++ ServerMain.py	5 Jan 2003 01:30:20 -0000	1.14
@@ -258,7 +258,7 @@
                        self.incomingQueue.count())
 
         mixDir = os.path.join(queueDir, "mix")
-        # FFFF The choice of mix algorithm should be configurable
+
         LOG.trace("Initializing Mix pool")
         self.mixPool = MixPool(config, mixDir)
         LOG.trace("Found %d pending messages in Mix pool",
@@ -300,8 +300,14 @@
         LOG.trace("Next mix at %s", formatTime(nextMix,1))
         scheduledEvents.sort()
 
-        #FFFF Unused
-        #nextRotate = self.keyring.getNextKeyRotation()
+        # FFFF Support for automatic key rotation.
+
+        # ???? Our cuurent approach can make the server unresponsive when 
+        # ???? mixing many messages at once: We stop answering requests, and
+        # ???? don't start again until we've delivered all the pending
+        # ???? messages!  Also, we process every packet as soon as it arrives,
+        # ???? which can also make the system pause for a few ms at a time.
+        # ????   Possible solutions:  Multiple threads or processes...?
         while 1:
             nextEventTime = scheduledEvents[0][0]
             timeLeft = nextEventTime - time.time()
@@ -321,11 +327,12 @@
             del scheduledEvents[0]
 
             if event == 'TIMEOUT':
-                LOG.info("Timing out.")
+                LOG.debug("Timing out old connections")
                 self.mmtpServer.tryTimeout(now)
                 insort(scheduledEvents,
                        (self.mmtpServer.getNextTimeoutTime(now), "TIMEOUT"))
             elif event == 'SHRED':
+                LOG.debug("Overwriting deleted files")
                 self.cleanQueues()
                 insort(scheduledEvents,
                        (now + 6000, "SHRED"))