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

8 years ago · 5e79b4686e
1 changed files with 1 additions and 1 deletions
--- a/zuul/cmd/merger.py
+++ b/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: