Changeset 7:39e2245da71c in mailjam for postman/daemon.py

Timestamp:

May 18, 2012, 5:54:56 PM (12 years ago)

Author:

Francisco de Borja Lopez Rio <borja@…>

Branch:

default

Phase:

public

Message:

Added some fixes to the XMLRPC server code

Added more tests for the XMLRPC server

File:

• postman/daemon.py (modified) (6 diffs)

postman/daemon.py

@@ -152 +152 @@
 
     def _listMethods(self):
-        return list_public_methods(self)
+        public_methods = []
+        public_methods += ['lists.'+i for i in dir(MailingListXMLRPC) if '_' not in i]
+        public_methods += ['members.'+i for i in dir(MemberXMLRPC) if '_' not in i]
+        return public_methods
 
     def _methodHelp(self, method):
@@ -165 +168 @@
     def add(self, info={}):
         self.postman.add_mailing_list(info)
+    def addresses(self):
+        return self.postman.mailings_addresses
 
 
@@ -185 +190 @@
         self.configfile = configfile
 
+        # FIXME: These should be loaded from a config file
+        self.address='localhost'
+        self.port = 9000
+        
         self.logfile = os.path.join(os.path.dirname(__file__), 'server.log')
         logging.basicConfig(filename=self.logfile, level=logging.DEBUG)
@@ -196 +205 @@
         of SimpleXMLRPCServer in that attribute. If there is already a server
         initialized there, simply return True
-        """
-        address='localhost'
-        port = 9000        
+        """           
         if not self.server:
-            msg = 'Creating XMLRPC server object on {}:{}'.format(address,port)
+            msg = 'Creating XMLRPC server object on {}:{}'.format(self.address,
+                                                                  self.port)
             logging.info(msg)
-            self.server = SimpleXMLRPCServer((address, port), allow_none=True,
-                                             logRequests=True)
+            self.server = SimpleXMLRPCServer((self.address, self.port),
+                                             allow_none=True,
+                                             logRequests=False)
             self.server.register_introspection_functions()
         return True
@@ -225 +234 @@
         self.server.register_instance(root, allow_dotted_names=True)
         self.ready_to_serve = True
+        return self.ready_to_serve
             
     def run(self):
@@ -234 +244 @@
         if not self.ready_to_serve:
             self.add_methods()
-        msg = 'Starting XMLRPC server on {}:{}'.format(address,port)
+        msg = 'Starting XMLRPC server on {}:{}'.format(self.address,
+                                                       self.port)
         logging.info(msg)
-        self.server.serve_forever()
+        try:
+            self.server.serve_forever()
+        except KeyboardInterrupt:
+            msg = 'Stopping server'
+            logging.info(msg)