Setup logging inside of the daemon context.

It doesn't work outside.

Change-Id: I410464cf36a375e964cd97ad5e80914ea81692a5
This commit is contained in:
James E. Blair 2012-05-31 13:38:09 -07:00
parent d3bbe00b6a
commit 4c58c8f599

View File

@ -89,7 +89,6 @@ if __name__ == '__main__':
server = Server()
server.parse_arguments()
server.read_config()
server.setup_logging()
if server.config.has_option('zuul', 'pidfile'):
pid_fn = os.path.expanduser(server.config.get('zuul', 'pidfile'))
@ -98,7 +97,9 @@ if __name__ == '__main__':
pid = daemon.pidlockfile.TimeoutPIDLockFile(pid_fn, 10)
if server.args.nodaemon:
server.setup_logging()
server.main()
else:
with daemon.DaemonContext(pidfile=pid):
server.setup_logging()
server.main()