summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Core.py
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
-rw-r--r--src/lib/Bcfg2/Server/Core.py10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index 8b9cd4916..13be70731 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -73,7 +73,7 @@ class BaseCore(object):
Bcfg2 Server logic and modules.
"""
- def __init__(self, setup, start_fam_thread=False):
+ def __init__(self, setup):
self.datastore = setup['repo']
if setup['debug']:
@@ -192,7 +192,6 @@ class BaseCore(object):
threading.Thread(name="%sFAMThread" % setup['filemonitor'],
target=self._file_monitor_thread)
self.lock = threading.Lock()
- self.start_fam_thread = start_fam_thread
self.stats = Statistics()
@@ -458,11 +457,10 @@ class BaseCore(object):
open(self.setup['daemon'], "w").write("%s\n" % os.getpid())
self._run()
-
+
self.fam.start()
- if self.start_fam_thread:
- self.fam_thread.start()
- self.fam.AddMonitor(self.cfile, self.setup)
+ self.fam_thread.start()
+ self.fam.AddMonitor(self.cfile, self.setup)
self._block()