2 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/BuiltinCore.py b/src/lib/Bcfg2/Server/BuiltinCore.py
index df25a24a8..4e15f85d4 100644
--- a/src/lib/Bcfg2/Server/BuiltinCore.py
+++ b/src/lib/Bcfg2/Server/BuiltinCore.py
@@ -19,8 +19,8 @@ class NoExposedMethod (Exception):
 class Core(BaseCore):
     name = 'bcfg2-server'
     
-    def __init__(self, setup, start_fam_thread=False):
-        BaseCore.__init__(self, setup, start_fam_thread=start_fam_thread)
+    def __init__(self, setup):
+        BaseCore.__init__(self, setup)
         self.server = None
         self.context = daemon.DaemonContext()
 
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()