2 commits - bin/kolab_smtp_access_policy.py pykolab/logger.py

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Thu Sep 11 21:46:54 CEST 2014


 bin/kolab_smtp_access_policy.py |    1 +
 pykolab/logger.py               |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8517e1d8ca37d1d4f9fb649a91e222de0d83f59b
Author: Daniel Hoffend <dh at dotlan.net>
Date:   Thu Sep 11 21:46:37 2014 +0200

    Fix session timeouts (#2661, #3567)

diff --git a/bin/kolab_smtp_access_policy.py b/bin/kolab_smtp_access_policy.py
index 6e904eb..4b3d89b 100755
--- a/bin/kolab_smtp_access_policy.py
+++ b/bin/kolab_smtp_access_policy.py
@@ -1158,6 +1158,7 @@ def cache_cleanup():
         ).filter(
                 PolicyResult.created < ((int)(time.time()) - cache_expire)
             ).delete()
+    session.commit()
 
 def cache_init():
     global cache, cache_expire, session


commit 9979cacd96ee89cdff64705ffab2a681250d32be
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Thu Sep 11 21:40:31 2014 +0200

    Fix typo

diff --git a/pykolab/logger.py b/pykolab/logger.py
index 51f3e12..3ad16e9 100644
--- a/pykolab/logger.py
+++ b/pykolab/logger.py
@@ -156,7 +156,7 @@ class Logger(logging.Logger):
 
                 if os.path.isfile(self.logfile):
                     try:
-                        if not user_uid == 0 or group_gid = 0:
+                        if not user_uid == 0 or group_gid == 0:
                             os.chown(
                                     self.logfile,
                                     user_uid,
@@ -214,6 +214,6 @@ class Logger(logging.Logger):
         if level <= self.debuglevel:
             # TODO: Not the way it's supposed to work!
             self.log(logging.DEBUG, '[%d]: %s' % (os.getpid(),msg))
- 
+
 
 logging.setLoggerClass(Logger)




More information about the commits mailing list