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

[minion-cvs] Only tell ping log about connections to servers we reco...



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

Modified Files:
	MMTPServer.py 
Log Message:
Only tell ping log about connections to servers we recognize

Index: MMTPServer.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/server/MMTPServer.py,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- MMTPServer.py	27 Dec 2004 00:15:57 -0000	1.86
+++ MMTPServer.py	3 May 2005 03:28:47 -0000	1.87
@@ -769,9 +769,10 @@
                 family, ip, port, keyID, serverName=serverName,
                 context=self.clientContext, certCache=self.certificateCache)
             nickname = mixminion.ServerInfo.getNicknameByKeyID(keyID)
-            if nickname is None:
-                nickname = "<unknown>"
-            con.configurePingLog(self.pingLog, nickname)
+            if nickname is not None:
+                # If we recognize this server, then we'll want to tell
+                # the ping log what happens to our connection attempt.
+                con.configurePingLog(self.pingLog, nickname)
             #con.allPacketsSent = finished #XXXX007 wrong!
             con.onClosed = finished
         except (socket.error, MixProtocolError), e: