From 923b30d9e41ffde8699a19c0b8258cdb4a5de01f Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 7 Mar 2014 16:12:11 -0800
Subject: [PATCH] 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
---
 zuul/cmd/merger.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zuul/cmd/merger.py b/zuul/cmd/merger.py
index f046235d3c..edf8da99de 100644
--- 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: