Browse Source

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

changes/92/79792/1
Jenkins 8 years ago committed by Gerrit Code Review
parent
commit
5e79b4686e
  1. 2
      zuul/cmd/merger.py

2
zuul/cmd/merger.py

@ -138,7 +138,7 @@ def main():
if server.config.has_option('merger', 'pidfile'):
pid_fn = os.path.expanduser(server.config.get('merger', 'pidfile'))
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)
if server.args.nodaemon:

Loading…
Cancel
Save