[Nym3-commit] r109 - trunk

[nym3-devel@lists.noreply.org]

Author: jr
Date: 2004-08-18 17:21:32 +0200 (Wed, 18 Aug 2004)
New Revision: 109

Modified:
   trunk/Config.py
   trunk/Main.py
   trunk/User.py
Log:
- use send instead of sendMessage (Main.py)
- add a DEBUG option. When debug is set messages are not sent through mixminion network but to stdout


Modified: trunk/Config.py
===================================================================
--- trunk/Config.py	2004-08-18 14:57:34 UTC (rev 108)
+++ trunk/Config.py	2004-08-18 15:21:32 UTC (rev 109)
@@ -1,6 +1,9 @@
 # $Id$
 
 #path = '/var/lib/nym3'
+
+DEBUG = False
+
 serverName = 'nymserv.komite.net'
 
 path = '.'

Modified: trunk/Main.py
===================================================================
--- trunk/Main.py	2004-08-18 14:57:34 UTC (rev 108)
+++ trunk/Main.py	2004-08-18 15:21:32 UTC (rev 109)
@@ -138,7 +138,7 @@
                                 msgCom.fromData(m,nymUser.getMail(m))
                                 msgList.append(msgCom)
                                 sendList.append(m)
-                        ec = nymUser.sendMessage(Message.buildMessage(msgList))
+                        ec = nymUser.send(Message.buildMessage(msgList))
                         if (ec == 0):
                             nymUser.markMid(sendList,lifeCycle['sent-in-full'])
                             if(nymUser['HoldUntilAck'] == 'never'):
@@ -159,7 +159,7 @@
                             sumCom.fromData(bf, blob)
                             comList.append(sumCom)
                             mList = mList + ml
-                        ec = nymUser.sendMessage(Message.buildMessage(comList))
+                        ec = nymUser.send(Message.buildMessage(comList))
                         if (ec == 0):
                             nymUser.markMid(mList, lifeCycle['synopsis-sent'])
                         else:
@@ -180,8 +180,12 @@
 	      
     
 if __name__ == '__main__':
-    optlist, pholder = getopt.getopt(sys.argv[1:], 'd:m')
+    optlist, pholder = getopt.getopt(sys.argv[1:], 'D:d:m')
     for o, a in optlist:
+        if o == "-D":
+            Config.DEBUG = True
+        
+    for o, a in optlist:
 	if o == "-d": # mail delivery
 	    processIncoming(a, sys.stdin.read())
 	    sys.exit(0)

Modified: trunk/User.py
===================================================================
--- trunk/User.py	2004-08-18 14:57:34 UTC (rev 108)
+++ trunk/User.py	2004-08-18 15:21:32 UTC (rev 109)
@@ -179,10 +179,14 @@
 	return Config.path + os.sep + self.data['username'] + '.surbs'
 
     def send(self, msg):
-	fname = Mail.tmpFileMsg(msg)
-	ec = os.system("mixminion send -R " + self.surbfile() + " -i " + fname)
-	os.unlink(fname)
-	return ec
+        if Config.DEBUG:
+            print msg
+            return 0
+        else:
+            fname = Mail.tmpFileMsg(msg)
+            ec = os.system("mixminion send -R " + self.surbfile() + " -i " + fname)
+            os.unlink(fname)
+            return ec
 
     def clean_surbs(self):
 	"Inspect the surbs and delete the used/outdated"