diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2008-09-09 04:20:38 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2008-09-09 04:20:38 +0000 |
commit | dd36b243507feb8a76c8b7dc99779594a2848d23 (patch) | |
tree | c850b08dae326fe11a17afdcd5fa9b025f3fa9a2 /src/lib/Server/Core.py | |
parent | 926c2d83ef9832a687b9c5276f9c06b453f75a11 (diff) | |
download | bcfg2-dd36b243507feb8a76c8b7dc99779594a2848d23.tar.gz bcfg2-dd36b243507feb8a76c8b7dc99779594a2848d23.tar.bz2 bcfg2-dd36b243507feb8a76c8b7dc99779594a2848d23.zip |
Make file monitor selectable
Handle child processes more aggressively
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4908 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Core.py')
-rw-r--r-- | src/lib/Server/Core.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index 5687cba9d..b29c9bf05 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -24,13 +24,15 @@ class CoreInitError(Exception): class Core(object): '''The Core object is the container for all Bcfg2 Server logic, and modules''' - def __init__(self, repo, plugins, structures, generators, password, svn, encoding): + def __init__(self, repo, plugins, structures, generators, password, svn, + encoding, filemonitor='default'): object.__init__(self) self.datastore = repo try: - self.fam = Bcfg2.Server.FileMonitor.default() + self.fam = Bcfg2.Server.FileMonitor.available[filemonitor]() except IOError: - raise CoreInitError, "failed to connect to fam" + raise CoreInitError, "failed to instantiate fam driver (used %s)" % \ + filemonitor self.pubspace = {} self.generators = [] self.structures = [] |