From dd36b243507feb8a76c8b7dc99779594a2848d23 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Tue, 9 Sep 2008 04:20:38 +0000 Subject: 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 --- src/lib/Server/Core.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/lib/Server/Core.py') 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 = [] -- cgit v1.2.3-1-g7c22