summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-07-09 08:49:54 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-07-09 08:49:59 -0400
commitaccbb1831ae88e57baabf01a783fe7a8ee0a0ccb (patch)
treee2f675f438e35a6109018acb979a9d091b6d7b63 /tools
parenta0f20bdde06ccb7be85f59e1b8fbf57e1c492e64 (diff)
downloadbcfg2-accbb1831ae88e57baabf01a783fe7a8ee0a0ccb.tar.gz
bcfg2-accbb1831ae88e57baabf01a783fe7a8ee0a0ccb.tar.bz2
bcfg2-accbb1831ae88e57baabf01a783fe7a8ee0a0ccb.zip
Core: apply FAM blocking option to all commands that start a server
Diffstat (limited to 'tools')
-rwxr-xr-xtools/bcfg2-profile-templates.py2
-rwxr-xr-xtools/bcfg2_local.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/bcfg2-profile-templates.py b/tools/bcfg2-profile-templates.py
index f4069e454..2b0ca6d63 100755
--- a/tools/bcfg2-profile-templates.py
+++ b/tools/bcfg2-profile-templates.py
@@ -67,7 +67,7 @@ def main():
logger.info("Bcfg2 server core loaded")
core.load_plugins()
logger.debug("Plugins loaded")
- core.fam.handle_events_in_interval(0.1)
+ core.block_for_fam_events(handle_events=True)
logger.debug("Repository events processed")
if setup['args']:
diff --git a/tools/bcfg2_local.py b/tools/bcfg2_local.py
index 8c164e52e..3c90a3ea5 100755
--- a/tools/bcfg2_local.py
+++ b/tools/bcfg2_local.py
@@ -20,7 +20,7 @@ class LocalCore(BaseCore):
Bcfg2.Server.Core.BaseCore.__init__(self, setup=setup)
setup['syslog'], setup['logging'] = saved
self.load_plugins()
- self.fam.handle_events_in_interval(0.1)
+ self.block_for_fam_events(handle_events=True)
def _daemonize(self):
return True