[minion-cvs] Be more explicit when connects fail but we pool success...

[nickm@seul.org (Nick Mathewson)]

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

Modified Files:
	ClientMain.py 
Log Message:
Be more explicit when connects fail but we pool successfully.

Index: ClientMain.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientMain.py,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- ClientMain.py	11 Feb 2003 22:18:03 -0000	1.51
+++ ClientMain.py	12 Feb 2003 01:22:57 -0000	1.52
@@ -1201,11 +1201,10 @@
                 if noPool and warnIfLost:
                     LOG.error("Error with pooling disabled: message lost")
                 elif lazyPool:
+                    LOG.info("Error while delivering message; message pooled")
                     self.poolMessages(msgList, routingInfo)
-                    #XXXX003 Log that error occurred, but is okay.
                 else:
-                    #XXXX003 Log that error occurred, but is okay.
-                    pass
+                    LOG.info("Error while delivering message; leaving in pool")
                 raise
             try:
                 clientLock()
@@ -1738,12 +1737,16 @@
             print "Interrupted.  Message not sent."
             sys.exit(1)
 
-    if parser.usingSURBList:
-        assert isinstance(path2, ListType)
-        client.sendReplyMessage(payload, path1, path2, forcePool, forceNoPool)
-    else:
-        client.sendForwardMessage(address, payload, path1, path2,
-                                  forcePool, forceNoPool)
+    try:
+        if parser.usingSURBList:
+            assert isinstance(path2, ListType)
+            client.sendReplyMessage(payload, path1, path2,
+                                    forcePool, forceNoPool)
+        else:
+            client.sendForwardMessage(address, payload, path1, path2,
+                                      forcePool, forceNoPool)
+    except UIError, e:
+        e.dump()
 
 _IMPORT_SERVER_USAGE = """\
 Usage: %s [options] <filename> ...