diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-05-07 16:35:54 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-05-07 16:35:54 +0000 |
| commit | 08f263a45a9f7d7b0f0799eceb0f605dd7f21ee4 (patch) | |
| tree | da71cc822b9bead28cefc0b1786b84dc690d81ff /src/sbin | |
| parent | 5832953aa1db82f553f6bfcb9ef273d351d1ae69 (diff) | |
| download | bcfg2-08f263a45a9f7d7b0f0799eceb0f605dd7f21ee4.tar.gz bcfg2-08f263a45a9f7d7b0f0799eceb0f605dd7f21ee4.tar.bz2 bcfg2-08f263a45a9f7d7b0f0799eceb0f605dd7f21ee4.zip | |
remove dependence on old daemonize code
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5212 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin')
| -rwxr-xr-x | src/sbin/bcfg2 | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2 index 0d9ac8093..c2fb25121 100755 --- a/src/sbin/bcfg2 +++ b/src/sbin/bcfg2 @@ -16,7 +16,6 @@ import Bcfg2.Options import Bcfg2.Client.XML import Bcfg2.Client.Frame import Bcfg2.Client.Tools -import Bcfg2.Daemon import Bcfg2.Proxy import Bcfg2.Logger @@ -302,17 +301,4 @@ if __name__ == '__main__': signal.signal(signal.SIGINT, cb_sigint_handler) client = Client() spid = os.getpid() - if client.setup["agent"]: - agent = Agent(client) - if client.setup["agent-background"]: - Bcfg2.Daemon.daemonize(client.setup["agent-background"]) - while not agent.shut: - try: - agent.serve_forever() - except: - agent.logger.error('Error in service loop') - agent.logger.error('Continuing') - if os.getpid() == spid: - print("Shutting down") - else: - client.run() + client.run() |