2 commits - pykolab/conf wallace/__init__.py wallace/module_resources.py

[Thomas Brüderli]

 pykolab/conf/defaults.py    |    4 +++-
 wallace/__init__.py         |    2 --
 wallace/module_resources.py |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 91f3f3b74fe106893582c87838a9fb25b0721aa6
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Nov 6 19:40:12 2014 -0500

    Add wallace.resource_calendar_expire_days to config defaults

diff --git a/pykolab/conf/defaults.py b/pykolab/conf/defaults.py
index 06e5372..3df9709 100644
--- a/pykolab/conf/defaults.py
+++ b/pykolab/conf/defaults.py
@@ -37,4 +37,6 @@ class Defaults(object):
         self.kolab_domain_sync_interval = 600
 
         self.kolab_default_locale = 'en_US'
-        self.ldap_unique_attribute = 'nsuniqueid'
\ No newline at end of file
+        self.ldap_unique_attribute = 'nsuniqueid'
+
+        self.wallace_resource_calendar_expire_days = 100
\ No newline at end of file
diff --git a/wallace/module_resources.py b/wallace/module_resources.py
index 89b5544..0b4d811 100644
--- a/wallace/module_resources.py
+++ b/wallace/module_resources.py
@@ -442,7 +442,7 @@ def expunge_resource_calendar(mailbox):
     """
     global imap
 
-    days = int(conf.get('wallace', 'resource_calendar_expire_days', 100))
+    days = int(conf.get('wallace', 'resource_calendar_expire_days'))
     now = datetime.datetime.now(tzlocal())
     expire_date = now - datetime.timedelta(days=days)
 


commit babaec0a07db0bd8f3f26019c93376308c0b47e4
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Nov 6 19:39:21 2014 -0500

    Don't explicitly terminate heartbeat process in sigterm handler (#3902)

diff --git a/wallace/__init__.py b/wallace/__init__.py
index 8d43be2..fc11b62 100644
--- a/wallace/__init__.py
+++ b/wallace/__init__.py
@@ -330,8 +330,6 @@ class WallaceDaemon(object):
         pass
 
     def remove_pid(self, *args, **kw):
-        if hasattr(self, 'heartbeat'):
-            self.heartbeat.terminate()
         if os.access(conf.pidfile, os.R_OK):
             os.remove(conf.pidfile)
         raise SystemExit