commit 5e79b4686ed99ce1834b390f6c4149ddf84c71f9
author Jenkins <jenkins@review.openstack.org> Tue Mar 11 22:24:44 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Mar 11 22:24:44 2014 +0000
tree d9ad93864dae1f764dc2386794492f8cab7ac2c7
parent 65d793acb6cf61d0820bcf4777fccd354712104f
parent 923b30d9e41ffde8699a19c0b8258cdb4a5de01f

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

zuul/cmd/merger.py

diff --git a/zuul/cmd/merger.py b/zuul/cmd/merger.py
index f046235..edf8da9 100644
--- a/zuul/cmd/merger.py
+++ b/zuul/cmd/merger.py
@@ -138,7 +138,7 @@
     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: