Branch 'pykolab-0.4' - 2 commits - pykolab/logger.py share/templates

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Thu May 31 14:45:54 CEST 2012


 pykolab/logger.py                             |   34 ++++++++++++++------------
 share/templates/roundcubemail/acl.inc.php.tpl |    4 ---
 2 files changed, 20 insertions(+), 18 deletions(-)

New commits:
commit 87699bf132a9166d16bdc0ac57a887f66316b3bc
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 9efaf737a917885ff98485a07b01cf339ccdd159
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';
 ?>





More information about the commits mailing list