X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSOURCES%2Fopenstack-ceilometer-compute.init;h=f5877b9cb5ca798242f0aacf16d419746eede565;hb=02d99ac3f1109fbddaa2e4852f844596e35f3183;hp=25e578a26f6d14e7658ccf3ae7a7915fa15f96c5;hpb=3129af66a075f16a30b138c36b707fbed536f394;p=openstack-build%2Fceilometer-build.git diff --git a/rpm/SOURCES/openstack-ceilometer-compute.init b/rpm/SOURCES/openstack-ceilometer-compute.init index 25e578a..f5877b9 100644 --- a/rpm/SOURCES/openstack-ceilometer-compute.init +++ b/rpm/SOURCES/openstack-ceilometer-compute.init @@ -31,7 +31,7 @@ start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " - daemon --user ceilometer --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile" + daemon --user ceilometer --pidfile $pidfile "$exec --logfile $logfile &>/dev/null & echo \$! > $pidfile" retval=$? echo [ $retval -eq 0 ] && touch $lockfile @@ -41,6 +41,11 @@ start() { stop() { echo -n $"Stopping $prog: " killproc -p $pidfile $prog + if pgrep ceilometer-$suffix &>/dev/null ; then + sleep 2 + pgrep ceilometer-$suffix &>/dev/null && \ + killall ceilometer-$suffix + fi retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile