zuul
/
zuul
Code Issues Proposed changes

Make zuul-merger default pidfile match init script 

The init script for the zuul-merger file does not look for the
zuul-merger PIDFILE in the same default location that the zuul-merger
uses. Make them both look at /var/run/zuul-merger/zuul-merger.pid.

Change-Id: Ia5829ef3887a5651d23a80dbd00e76972c7cf6a7
changes/09/79109/1
Clark Boylan 2014-03-07 16:12:11 -08:00
parent ac6c77d06b
commit 923b30d9e4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zuul/cmd/merger.py
View File

@ -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: