summaryrefslogtreecommitdiffstats
path: root/kolabd
diff options
context:
space:
mode:
authorJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-03-13 18:06:31 +0000
committerJeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>2011-03-13 18:06:31 +0000
commit1a6d9ae93de38aa6c53f4cc2cf8d71e13d4ba83b (patch)
tree9312dbec72778e5cbcc6da884ccbbf6c1546051f /kolabd
parent9950787088462b26579400294b3ce92c8c94d2b2 (diff)
downloadpykolab-1a6d9ae93de38aa6c53f4cc2cf8d71e13d4ba83b.tar.gz
Remove saslauthd options and code from the main daemon
Diffstat (limited to 'kolabd')
-rw-r--r--kolabd/__init__.py21
1 files changed, 4 insertions, 17 deletions
diff --git a/kolabd/__init__.py b/kolabd/__init__.py
index daf2592..1e1d051 100644
--- a/kolabd/__init__.py
+++ b/kolabd/__init__.py
@@ -49,12 +49,6 @@ class KolabDaemon(object):
default = False,
help = _("Fork to the background."))
- daemon_group.add_option( "--saslauthd",
- dest = "saslauth_mode",
- action = "store_true",
- default = False,
- help = _("Include the SASL Authentication Daemon."))
-
self.conf.finalize_conf()
self.log = self.conf.log
@@ -67,24 +61,16 @@ class KolabDaemon(object):
exitcode = 0
# TODO: Add a nosync option
-
- if self.conf.saslauth_mode:
- self.thread_count += 1
- pid = os.fork()
- if pid == 0:
- self.log.remove_stdout_handler()
- self.do_saslauthd()
-
try:
+ pid = 1
if self.conf.fork_mode:
self.thread_count += 1
pid = os.fork()
- else:
- self.do_sync()
if pid == 0:
self.log.remove_stdout_handler()
- self.do_sync()
+
+ self.do_sync()
except SystemExit, e:
exitcode = e
@@ -107,6 +93,7 @@ class KolabDaemon(object):
def do_sync(self):
while 1:
+ # TODO: Interval should be configurable
self.log.debug(_("Sleeping for 10 seconds..."), 5)
time.sleep(10)
auth = Auth(self.conf)