X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=rpm%2FSOURCES%2Fopenstack-ceilometer-collector.init;h=a42e3258b3c4f188311bbc6e52522052f23a67ee;hb=02d99ac3f1109fbddaa2e4852f844596e35f3183;hp=9dca49234af71d49c68be451a1d4abb168fae9d1;hpb=3129af66a075f16a30b138c36b707fbed536f394;p=openstack-build%2Fceilometer-build.git

diff --git a/rpm/SOURCES/openstack-ceilometer-collector.init b/rpm/SOURCES/openstack-ceilometer-collector.init
index 9dca492..a42e325 100644
--- a/rpm/SOURCES/openstack-ceilometer-collector.init
+++ b/rpm/SOURCES/openstack-ceilometer-collector.init
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
-# openstack-ceilometer-collector  OpenStack ceilometer collector Server
+# openstack-ceilometer-collector  OpenStack ceilometer collector Service
 #
 # chkconfig:   - 98 02
-# description: OpenStack measurement and collection service collector agent
+# description: OpenStack measurement and collection service collector
 
 ### BEGIN INIT INFO
 # Provides:
@@ -11,7 +11,7 @@
 # Required-Stop: $remote_fs $syslog
 # Default-Stop: 0 1 6
 # Short-Description: OpenStack ceilometer collector Server
-# Description: OpenStack measurement and collection service collector agent
+# Description: OpenStack measurement and collection service collector
 ### END INIT INFO
 
 . /etc/rc.d/init.d/functions
@@ -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