Merge "Cancel obsolete builds on reconfiguration"
diff --git a/doc/source/zuul.rst b/doc/source/zuul.rst
index ee70523..1a6a23d 100644
--- a/doc/source/zuul.rst
+++ b/doc/source/zuul.rst
@@ -87,11 +87,11 @@
``layout_config=/etc/zuul/layout.yaml``
**log_config**
- Path to log config file. Used by all Zuul commands.
+ Path to log config file. Used by zuul-server only.
``log_config=/etc/zuul/logging.yaml``
**pidfile**
- Path to PID lock file. Used by all Zuul commands.
+ Path to PID lock file. Used by zuul-server only.
``pidfile=/var/run/zuul/zuul.pid``
**state_dir**
@@ -143,6 +143,14 @@
"http://zuul.example.com/p" or "http://zuul-merger01.example.com/p"
depending on whether the merger is co-located with the Zuul server.
+**log_config**
+ Path to log config file for the merger process.
+ ``log_config=/etc/zuul/logging.yaml``
+
+**pidfile**
+ Path to PID lock file for the merger process.
+ ``pidfile=/var/run/zuul-merger/merger.pid``
+
smtp
""""
diff --git a/zuul/cmd/merger.py b/zuul/cmd/merger.py
index e9722cf..f046235 100644
--- a/zuul/cmd/merger.py
+++ b/zuul/cmd/merger.py
@@ -94,7 +94,7 @@
# See comment at top of file about zuul imports
import zuul.merger.server
- self.setup_logging('zuul', 'log_config')
+ self.setup_logging('merger', 'log_config')
self.merger = zuul.merger.server.MergeServer(self.config)
self.merger.start()
@@ -135,10 +135,10 @@
print
raise
- if server.config.has_option('zuul', 'pidfile'):
- pid_fn = os.path.expanduser(server.config.get('zuul', 'pidfile'))
+ if server.config.has_option('merger', 'pidfile'):
+ pid_fn = os.path.expanduser(server.config.get('merger', 'pidfile'))
else:
- pid_fn = '/var/run/zuul/merger.pid'
+ pid_fn = '/var/run/zuul-merger/merger.pid'
pid = pid_file_module.TimeoutPIDLockFile(pid_fn, 10)
if server.args.nodaemon: