diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-05 08:00:20 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-05 08:00:20 -0400 |
| commit | 98fa4b4978ebd63b4a108cb7d366f11edd60d6a2 (patch) | |
| tree | 5f3505fa0cd86d035a6875564a2270330c8431df /src/lib/Bcfg2 | |
| parent | 864dd26107e6ab8dcd78096b66883d6ab0e5fdde (diff) | |
| download | bcfg2-98fa4b4978ebd63b4a108cb7d366f11edd60d6a2.tar.gz bcfg2-98fa4b4978ebd63b4a108cb7d366f11edd60d6a2.tar.bz2 bcfg2-98fa4b4978ebd63b4a108cb7d366f11edd60d6a2.zip | |
updated various scripts/components to reflect updated Core invocation for thread-safety
Diffstat (limited to 'src/lib/Bcfg2')
| -rw-r--r-- | src/lib/Bcfg2/Server/BuiltinCore.py | 4 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 10 |
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() |