diff options
Diffstat (limited to 'src/lib/Server')
| -rw-r--r-- | src/lib/Server/Core.py | 8 | ||||
| -rw-r--r-- | src/lib/Server/FileMonitor.py | 2 |
2 files changed, 6 insertions, 4 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 = [] diff --git a/src/lib/Server/FileMonitor.py b/src/lib/Server/FileMonitor.py index bb0441c65..bea210150 100644 --- a/src/lib/Server/FileMonitor.py +++ b/src/lib/Server/FileMonitor.py @@ -231,5 +231,5 @@ available['pseudo'] = PseudoFam for fdrv in ['gamin', 'fam', 'pseudo']: if fdrv in available: - default = available[fdrv] + available['default'] = available[fdrv] break |