summaryrefslogtreecommitdiff
path: root/elements/os-svc-install
diff options
context:
space:
mode:
authorMichael Kerrin <michael.kerrin@hp.com>2014-10-24 16:42:12 +0100
committerMichael Kerrin <michael.kerrin@hp.com>2014-10-24 16:42:12 +0100
commit615c6bb95b818551934e652e70cd7833f965ccd6 (patch)
treee3d179ce4725323633802b520466ff3c5089f1fa /elements/os-svc-install
parent7ef1a7d049e2db3ba309c306a1399542dcb4aeeb (diff)
We need to tell upstart to expect the logger fork
Otherwise upstart doesn't get the correct process id for the service and in some causes can fail to kill the process during a servcie stop Change-Id: I138dd2206ed1e511fbabaf43bd3cb1d163c76db4 Closes-bug: #1385346
Notes
Notes (review): Verified+2: Jenkins Code-Review+2: lifeless <robertc@robertcollins.net> Code-Review+1: Clint 'SpamapS' Byrum <clint@fewbar.com> Code-Review+2: Steve Kowalik <steven@wedontsleep.org> Workflow+1: Steve Kowalik <steven@wedontsleep.org> Submitted-by: Jenkins Submitted-at: Thu, 13 Nov 2014 02:15:53 +0000 Reviewed-on: https://review.openstack.org/130830 Project: openstack/tripleo-image-elements Branch: refs/heads/master
Diffstat (limited to 'elements/os-svc-install')
-rwxr-xr-xelements/os-svc-install/bin/os-svc-daemon3
1 files changed, 3 insertions, 0 deletions
diff --git a/elements/os-svc-install/bin/os-svc-daemon b/elements/os-svc-install/bin/os-svc-daemon
index fd5ff0b..9201a93 100755
--- a/elements/os-svc-install/bin/os-svc-daemon
+++ b/elements/os-svc-install/bin/os-svc-daemon
@@ -134,6 +134,9 @@ respawn limit 2 5
134# We're logging to syslog 134# We're logging to syslog
135console none 135console none
136 136
137# The pipe to logger introduces a fork, so we need to tell upstart
138expect fork
139
137exec start-stop-daemon --start -c $user --exec $install_dir/bin/$cmd -- $args 2>&1 | logger -t $name 140exec start-stop-daemon --start -c $user --exec $install_dir/bin/$cmd -- $args 2>&1 | logger -t $name
138 141
139post-start $POSTSTART 142post-start $POSTSTART