Changeset 33:8efa7a7802d4 in mailjam

Timestamp:

May 24, 2012, 7:25:07 PM (13 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Added a new configuration parameter to the xmlrpc_server section of
mailman.conf, access_log, that sets the path to the log file where
incoming requests will be logged (web server style)

Enabled requests logging in the call to SimpleXMLRPCServer

Set current version to 0.1.1, as we have everything we wanted for 0.1.0
plus some bug fixes.

Files:

• conf/mailjam.conf (modified) (1 diff)
• mailjam/__init__.py (modified) (1 diff)
• mailjam/daemon.py (modified) (1 diff)
• mailjam/tests/mailjam.conf (modified) (1 diff)
• setup.py (modified) (3 diffs)

conf/mailjam.conf

@@ -10 +10 @@
 ssl_crt = /usr/local/etc/mailjam/ssl/mailjam.crt
 logfile = /var/log/mailjam/xmlrpc_server.log
+accesslog = /var/log/mailjam/access.log
 
 [storage]

mailjam/__init__.py

@@ -11 +11 @@
 """
 
-__version__ = '0.1.0'
-
+__version__ = '0.1.1'
 
 from mailjam.models import Member, MailingList

mailjam/daemon.py

@@ -235 +235 @@
             self.server = SimpleXMLRPCServer((self.address, self.port),
                                              allow_none=True,
-                                             logRequests=False)
+                                             logRequests=True)
             self.server.register_introspection_functions()
         return True

mailjam/tests/mailjam.conf

@@ -12 +12 @@
 ssl_crt = /usr/local/etc/mailjam/ssl/mailjam.crt
 logfile = /tmp/mailjam-tests/xmlrpc_server.log
+accesslog = /var/log/mailjam/access.log
 
 [storage]

setup.py

@@ -2 +2 @@
 from distutils.core import setup
 
+# Yes, I'm ommiting windoze...
+BSDs = ['FreeBSD', 'OpenBSD', 'NetBSD', 'DragonFlyBSD']
+linux = ['Linux']
+osx = ['Darwin']
+
 def proper_etc_path():
-    # Yes, I'm ommiting windoze...
-    BSDs = ['FreeBSD', 'OpenBSD', 'NetBSD', 'DragonFlyBSD']
-    linux = ['Linux']
-    osx = ['Darwin']
+    """
+    Try to set the proper path for configuration files, depending
+    on the operating system.
+
+    FIXME: I'm not sure this would work fine, as this will be executed
+    when running python setup.py sdist, not when installing from the
+    source package.
+    """
     os_name = os.uname()[0]
     if os_name in BSDs:
@@ -12 +21 @@
     if os_name in linux or os_name in osx:
         return '/etc/'    
+    return ''
+
+def proper_rc_path():
+    """
+    Similar to proper_etc_path(), returns the path where startup scripts
+    should be placed
+    """
+    os_name = os.uname()[0]
+    etc_path = proper_etc_path()
+    if os_name in 'BSDs':
+        return etc_path+'rc.d'
+    if os_name in linux:
+        return etc_path+'init.d'
+    if os_name in osx:
+        # FIXME: not sure about where startup scripts should be placed in
+        # "stock" osx (no macports, no homebrew, etc)
+        return etc_path
+    return ''
 
 setup(
     name='mailjam',
-    version='0.1.0',
+    version='0.1.1',
     author='Francisco de Borja Lopez Rio',
     author_email='borja@codigo23.net',
-    packages=['mailjam'],
+    packages=['mailjam'],    
     url='https://bitbucket.org/codigo23/mailjam',
     license='BSD licence, see LICENSE',
@@ -26 +53 @@
     data_files=[(proper_etc_path()+'mailjam', ['conf/mailjam.conf',
                                                'conf/mailjam-mta.conf',
-                                               'conf/mailjam-cli.conf']),
-                ]
+                                               'conf/mailjam-cli.conf']),
+                (proper_rc_path(), ['bin/rc.d/mailjam'])]
 )