5 commits - Makefile.am pykolab/cli pykolab/conf pykolab/logger.py share/templates

[Jeroen van Meeuwen]

 Makefile.am                                   |    3 ++
 pykolab/cli/commands.py                       |    6 +++-
 pykolab/conf/__init__.py                      |    2 -
 pykolab/logger.py                             |   34 ++++++++++++++------------
 share/templates/roundcubemail/acl.inc.php.tpl |    4 ---
 5 files changed, 29 insertions(+), 20 deletions(-)

New commits:
commit 445cf0701f7dc9e301f256cf270afdb4b9a772a8
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu May 31 14:45:14 2012 +0200

    Attempt to append to the log file, escape permission errors on log file

diff --git a/pykolab/logger.py b/pykolab/logger.py
index 878f79f..a0c75c9 100644
--- a/pykolab/logger.py
+++ b/pykolab/logger.py
@@ -84,13 +84,6 @@ class Logger(logging.Logger):
         else:
             self.logfile = '/var/log/kolab/pykolab.log'
 
-        # Make sure the log file exists
-        fhandle = file(self.logfile, 'a')
-        try:
-            os.utime(self.logfile, None)
-        finally:
-            fhandle.close()
-
         # Make sure (read: attempt to change) the permissions
         try:
             (ruid, euid, suid) = os.getresuid()
@@ -113,17 +106,28 @@ class Logger(logging.Logger):
                                 self.logfile
                             )
 
+        # Make sure the log file exists
         try:
-            filelog_handler = logging.FileHandler(filename=self.logfile)
-            filelog_handler.setFormatter(plaintextformatter)
-        except IOError, e:
-            print >> sys.stderr, _("Cannot log to file %s: %s") % (self.logfile, e)
+            fhandle = file(self.logfile, 'a')
+            try:
+                os.utime(self.logfile, None)
+            finally:
+                fhandle.close()
 
-        if not len(self.handlers) > 1:
             try:
-                self.addHandler(filelog_handler)
-            except:
-                pass
+                filelog_handler = logging.FileHandler(filename=self.logfile)
+                filelog_handler.setFormatter(plaintextformatter)
+            except IOError, e:
+                print >> sys.stderr, _("Cannot log to file %s: %s") % (self.logfile, e)
+
+            if not len(self.handlers) > 1:
+                try:
+                    self.addHandler(filelog_handler)
+                except:
+                    pass
+
+        except IOError, errmsg:
+            pass
 
     def remove_stdout_handler(self):
         if not self.fork:


commit 46703a8c8a615f3d75728536bc2bb272d2d40316
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu May 31 14:45:05 2012 +0200

    Add make check target

diff --git a/Makefile.am b/Makefile.am
index 24bf651..6561440 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -172,6 +172,9 @@ binary:
 		kolabd.py
 	cd src/kolabd/; $(MAKE)
 
+check:
+	nosetests -v tests/
+
 clean:
 	rm -rf src/*; mkdir -p src/
 	find -type f -name "*.pyo" -o -name "*.pyc" -delete


commit 54225ac2020234df7821b59e0165721340cdd0a9
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed May 30 15:04:51 2012 +0200

    Fix auto-completion (#812)

diff --git a/share/templates/roundcubemail/acl.inc.php.tpl b/share/templates/roundcubemail/acl.inc.php.tpl
index e056660..0e26cd2 100644
--- a/share/templates/roundcubemail/acl.inc.php.tpl
+++ b/share/templates/roundcubemail/acl.inc.php.tpl
@@ -1,8 +1,6 @@
 <?php
     \$rcmail_config['acl_advanced_mode'] = false;
-    \$rcmail_config['acl_users_source'] = 'Kolab';
+    \$rcmail_config['acl_users_source'] = 'kolab_addressbook';
     \$rcmail_config['acl_users_field'] = 'mail';
     \$rcmail_config['acl_users_filter'] = 'objectClass=kolabInetOrgPerson';
-
-    \$rcmail_config['acl_users_source'] = 'kolab_ldap';
 ?>


commit 6773c015c5422f4b265ba59fb190fc22156d0469
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed May 30 14:41:38 2012 +0200

    Do not load commands that fail loading (#811)

diff --git a/pykolab/cli/commands.py b/pykolab/cli/commands.py
index f1b9ac8..6dedc6c 100644
--- a/pykolab/cli/commands.py
+++ b/pykolab/cli/commands.py
@@ -43,7 +43,11 @@ def __init__():
                 module_name = filename.replace('.py','')
                 cmd_name = module_name.replace('cmd_', '')
                 #print "exec(\"from %s import __init__ as %s_register\"" % (module_name,cmd_name)
-                exec("from %s import __init__ as %s_register" % (module_name,cmd_name))
+                try:
+                    exec("from %s import __init__ as %s_register" % (module_name,cmd_name))
+                except ImportError, errmsg:
+                    pass
+
                 exec("%s_register()" % (cmd_name))
 
         for dirname in dirnames:


commit bb2020d418255e0a3767878c48474896ed57c55a
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed May 30 14:04:31 2012 +0200

    Remove inconsistent default option value for log file and replace with correct location

diff --git a/pykolab/conf/__init__.py b/pykolab/conf/__init__.py
index 441c99b..29675ae 100644
--- a/pykolab/conf/__init__.py
+++ b/pykolab/conf/__init__.py
@@ -290,7 +290,7 @@ class Conf(object):
         runtime_group.add_option(   "--logfile",
                                     dest    = "logfile",
                                     action  = "store",
-                                    default = "/var/log/kolabd/kolabd.log",
+                                    default = "/var/log/kolab/pykolab.log",
                                     help    = _("Log file to use"))
 
         runtime_group.add_option(   "-q", "--quiet",