diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-07 09:49:04 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-07 09:50:12 -0400 |
| commit | db63df1b0e839e7339197d9b13fcdcbcc2c7dc91 (patch) | |
| tree | 9fcbcfcfcf050aaa941ec1db3637cce844090e47 | |
| parent | 575d64c8232449b7ea8a1a6e6b2d25816cbf7ff1 (diff) | |
| download | bcfg2-db63df1b0e839e7339197d9b13fcdcbcc2c7dc91.tar.gz bcfg2-db63df1b0e839e7339197d9b13fcdcbcc2c7dc91.tar.bz2 bcfg2-db63df1b0e839e7339197d9b13fcdcbcc2c7dc91.zip | |
added remaining required Core.load_plugins() calls
| -rw-r--r-- | src/lib/Bcfg2/Server/Admin/__init__.py | 1 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-lint | 3 | ||||
| -rwxr-xr-x | tools/bcfg2_local.py | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/__init__.py b/src/lib/Bcfg2/Server/Admin/__init__.py index 7bba05eb3..8f12a940e 100644 --- a/src/lib/Bcfg2/Server/Admin/__init__.py +++ b/src/lib/Bcfg2/Server/Admin/__init__.py @@ -128,6 +128,7 @@ class MetadataCore(Mode): except Bcfg2.Server.Core.CoreInitError: msg = sys.exc_info()[1] self.errExit("Core load failed: %s" % msg) + self.bcore.load_plugins() self.bcore.fam.handle_event_set() self.metadata = self.bcore.metadata diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint index 430c4c54f..103ff3555 100755 --- a/src/sbin/bcfg2-lint +++ b/src/sbin/bcfg2-lint @@ -67,7 +67,8 @@ def get_errorhandler(setup): def load_server(setup): """ load server """ core = Bcfg2.Server.Core.BaseCore(setup) - core.fam.handle_events_in_interval(4) + core.load_plugins() + core.fam.handle_events_in_interval(0.1) return core diff --git a/tools/bcfg2_local.py b/tools/bcfg2_local.py index edb5a7101..8c164e52e 100755 --- a/tools/bcfg2_local.py +++ b/tools/bcfg2_local.py @@ -19,7 +19,8 @@ class LocalCore(BaseCore): setup['logging'] = None Bcfg2.Server.Core.BaseCore.__init__(self, setup=setup) setup['syslog'], setup['logging'] = saved - self.fam.handle_events_in_interval(4) + self.load_plugins() + self.fam.handle_events_in_interval(0.1) def _daemonize(self): return True |