Merge "Make zuul-merger default pidfile match init script"

This commit is contained in:
Jenkins 2014-03-11 22:24:44 +00:00 committed by Gerrit Code Review
commit 5e79b4686e
1 changed files with 1 additions and 1 deletions

View File

@ -138,7 +138,7 @@ def main():
if server.config.has_option('merger', 'pidfile'): if server.config.has_option('merger', 'pidfile'):
pid_fn = os.path.expanduser(server.config.get('merger', 'pidfile')) pid_fn = os.path.expanduser(server.config.get('merger', 'pidfile'))
else: else:
pid_fn = '/var/run/zuul-merger/merger.pid' pid_fn = '/var/run/zuul-merger/zuul-merger.pid'
pid = pid_file_module.TimeoutPIDLockFile(pid_fn, 10) pid = pid_file_module.TimeoutPIDLockFile(pid_fn, 10)
if server.args.nodaemon: if server.args.nodaemon: