summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-01-10 00:02:14 +0000
committerGerrit Code Review <review@openstack.org>2018-01-10 00:02:14 +0000
commit452ca6bbb63dae2b1d91cd0854b134fdb3181d00 (patch)
tree4e1df853a64bc5a7b6f0e14ecb6594c2c7309274
parent72b63744a9382086ef5ca89054fd3a7f49b6e00f (diff)
parentad5431d274a32cb8421146ccdb48af0f0631fa58 (diff)
downloadzuul-452ca6bbb63dae2b1d91cd0854b134fdb3181d00.tar.gz
Merge "Fix error handling for pidfile" into feature/zuulv3
-rwxr-xr-xzuul/cmd/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/zuul/cmd/__init__.py b/zuul/cmd/__init__.py
index 236fd9f44..07d4a8d08 100755
--- a/zuul/cmd/__init__.py
+++ b/zuul/cmd/__init__.py
@@ -181,8 +181,9 @@ class ZuulDaemonApp(ZuulApp):
else:
# Exercise the pidfile before we do anything else (including
# logging or daemonizing)
- with daemon.DaemonContext(pidfile=pid):
+ with pid:
pass
+
with daemon.DaemonContext(pidfile=pid):
self.run()