diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-11 13:27:07 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-11 13:27:17 -0400 |
commit | afeeb2b6430875cc3979ae4ad690d2a3efc0ac68 (patch) | |
tree | 8e68a03334c5f21cd0974c757b49ef75413d1c18 /src/lib/Bcfg2/Server/Core.py | |
parent | c5b4bfd842a6f03a4c840cd32c3a99bcc57a8c48 (diff) | |
download | bcfg2-afeeb2b6430875cc3979ae4ad690d2a3efc0ac68.tar.gz bcfg2-afeeb2b6430875cc3979ae4ad690d2a3efc0ac68.tar.bz2 bcfg2-afeeb2b6430875cc3979ae4ad690d2a3efc0ac68.zip |
moved plugin-specific configs to main config file; propagate "setup" object to server Core
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index a253fd367..8482925b7 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -62,7 +62,7 @@ class Core(Component): implementation = 'bcfg2-server' def __init__(self, repo, plugins, password, encoding, - cfile='/etc/bcfg2.conf', ca=None, + cfile='/etc/bcfg2.conf', ca=None, setup=None, filemonitor='default', start_fam_thread=False): Component.__init__(self) self.datastore = repo @@ -85,6 +85,7 @@ class Core(Component): self.revision = '-1' self.password = password self.encoding = encoding + self.setup = setup atexit.register(self.shutdown) # Create an event to signal worker threads to shutdown self.terminate = threading.Event() @@ -131,6 +132,11 @@ class Core(Component): self.fam_thread = threading.Thread(target=self._file_monitor_thread) if start_fam_thread: self.fam_thread.start() + self.monitor_cfile() + + def monitor_cfile(self): + if self.setup: + self.fam.AddMonitor(self.cfile, self.setup) def plugins_by_type(self, base_cls): """Return a list of loaded plugins that match the passed type. |