diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-07-09 08:49:54 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-07-09 08:49:59 -0400 |
| commit | accbb1831ae88e57baabf01a783fe7a8ee0a0ccb (patch) | |
| tree | e2f675f438e35a6109018acb979a9d091b6d7b63 /src/sbin | |
| parent | a0f20bdde06ccb7be85f59e1b8fbf57e1c492e64 (diff) | |
| download | bcfg2-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 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2-info | 2 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-lint | 2 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-test | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 406e7e003..cc9b03b80 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -717,7 +717,7 @@ Bcfg2 client itself.""") def run(self, args): # pylint: disable=W0221 try: self.load_plugins() - self.fam.handle_events_in_interval(1) + self.block_for_fam_events(handle_events=True) if args: self.onecmd(" ".join(args)) else: diff --git a/src/sbin/bcfg2-lint b/src/sbin/bcfg2-lint index ab3b6450f..9ceb1dd04 100755 --- a/src/sbin/bcfg2-lint +++ b/src/sbin/bcfg2-lint @@ -73,7 +73,7 @@ def load_server(setup): """ load server """ core = Bcfg2.Server.Core.BaseCore(setup) core.load_plugins() - core.fam.handle_events_in_interval(0.1) + core.block_for_fam_events(handle_events=True) return core diff --git a/src/sbin/bcfg2-test b/src/sbin/bcfg2-test index a7a6781a9..7c38a65d8 100755 --- a/src/sbin/bcfg2-test +++ b/src/sbin/bcfg2-test @@ -157,7 +157,7 @@ def get_core(setup): """ Get a server core, with events handled """ core = Bcfg2.Server.Core.BaseCore(setup) core.load_plugins() - core.fam.handle_events_in_interval(0.1) + core.block_for_fam_events(handle_events=True) return core |