[Nym3-commit] r520 - trunk/nymbaron/Server

[jr at conuropsis.org]

Author: jr
Date: 2006-06-21 00:34:13 +0200 (Wed, 21 Jun 2006)
New Revision: 520

Modified:
   trunk/nymbaron/Server/Main.py
   trunk/nymbaron/Server/User.py
Log:
- use the success function mecanism for the Get message processing


Modified: trunk/nymbaron/Server/Main.py
===================================================================
--- trunk/nymbaron/Server/Main.py	2006-06-20 20:29:46 UTC (rev 519)
+++ trunk/nymbaron/Server/Main.py	2006-06-20 22:34:13 UTC (rev 520)
@@ -360,17 +360,9 @@
                             msgCom.fromData(m, nymUser.getMail(m))
                             msgList.append(msgCom)
                             sendList.append(m)
-                    ec = nymUser.advanced_send(
-                            Message.buildMessage(msgList))
-                    logger.debug("EC is " + str(ec))
-                    if ec == 0:
-                        nymUser.markMid(sendList, lifeCycle['sent-in-full'])
-                        if nymUser['HoldUntilAck'] == 'never':
-                            map(nymUser.delete_msg, sendList)
-                        
-                    else:
-                        logger.error("mixminion exited abnormally with error code %d" % ec)
-                        sys.exit(2)
+                    nymUser.advanced_send(Message.buildMessage(msgList),
+                            fun = nymUser.afterSend,
+                            funargs = (sendList,))
                             
                 elif com.ct() == Message.CToSCODE['Summarize']:
                     #cf 2.3 synopses item 1
@@ -388,6 +380,7 @@
                         sumCom = Message.Summary()
                         sumCom.fromData("\x00\x00","")
                         comList = [sumCom]
+                    #TODO add a lifeCycle syn-send-scheduled?
                     nymUser.advanced_send(Message.buildMessage(comList), \
                         fun = nymUser.markMid, \
                         funargs = (mList, lifeCycle['synopsis-sent']))

Modified: trunk/nymbaron/Server/User.py
===================================================================
--- trunk/nymbaron/Server/User.py	2006-06-20 20:29:46 UTC (rev 519)
+++ trunk/nymbaron/Server/User.py	2006-06-20 22:34:13 UTC (rev 520)
@@ -873,7 +873,12 @@
             for e in l:
                 if (self.index[e]['status'] < mark):
                     self.index[e]['status'] = mark
-        
+
+    def afterSend(self, sendList):
+        self.markMid(sendList, lifeCycle['sent-in-full'])
+        if self['HoldUntilAck'] == 'never':
+            map(self.delete_msg, sendList)
+    
     def hasMail(self, mid):
         """Checks whether the server holds a mail for a given mid"""
         self.load_index()