Changeset 20:bf238ca0c37f in mailjam for mailjam/daemon.py

Timestamp:

May 22, 2012, 1:28:15 PM (12 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Fixed multiple bugs found while doing manual tests of both the server and
MTA client. All of those bugs are related to how configuration files are
loaded.

File:

• mailjam/daemon.py (modified) (8 diffs)

mailjam/daemon.py

@@ -1 +1 @@
 # -*- coding: utf-8 -*-
+
+"""
+The mailjam project - daemon.py
+
+This file is released under the BSD license, see LICENSE for
+more information.
+
+Francisco de Borja Lopez Rio - <borja@codigo23.net>
+Soluciones Informaticas Codigo23 S.L.U. - http://codigo23.net
+"""
 
 import os, inspect, logging
@@ -12 +22 @@
 
     def __init__(self, configfile=None):
+        self.configfile=configfile
         self.storage_config = config.get_config_parameters('storage',
                                                            configfile)
@@ -54 +65 @@
             # now load all the mailing objects:
             for address in self.mailings_addresses:
-                mailing = MailingList(address, address)
+                mailing = MailingList(name=address, address=address,
+                                      configfile=self.configfile)
                 mailing.load()
                 self.mailings[address] = mailing                
@@ -146 +158 @@
     """
 
+    def __init__(self, configfile=None):
+        self.configfile = configfile
+
     def _listMethods(self):
         public_methods = []
@@ -158 +173 @@
 
 class MailingListXMLRPC():
-    def __init__(self):
-        self.mailjam = Mailjam()
+    def __init__(self, configfile=None):
+        self.mailjam = Mailjam(configfile=configfile)
         self.mailjam.load()
     def add(self, info={}):
@@ -168 +183 @@
 
 class MemberXMLRPC():
-    def __init__(self):
-        self.mailjam = Mailjam()
+    def __init__(self, configfile=None):
+        self.mailjam = Mailjam(configfile=configfile)
         self.mailjam.load()
     def add(self, member_addr=None, list_addr=None):
@@ -180 +195 @@
 class MailjamDaemon():
     def __init__(self, configfile=None):
+        self.configfile = configfile
         self.config = config.get_config_parameters('xmlrpc_server', configfile)
-
-        # FIXME: These should be loaded from a config file
         self.address = self.config.get('address', 'localhost')
         self.port = int(self.config.get('port', 9876))
@@ -221 +235 @@
         msg = 'Registering public methods'
         logging.info(msg)
-        root = MailjamXMLRPC()
-        root.lists = MailingListXMLRPC()
-        root.members = MemberXMLRPC()
+        root = MailjamXMLRPC(self.configfile)
+        root.lists = MailingListXMLRPC(self.configfile)
+        root.members = MemberXMLRPC(self.configfile)
         self.server.register_instance(root, allow_dotted_names=True)
         self.ready_to_serve = True