X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;f=rpm%2FSOURCES%2Fneutron-metadata-agent.init;h=40cc5a1a6250b81a0bac5375815ad7c08b2e32ea;hb=refs%2Fheads%2Fopenstack-ci%2Ffuel-5.0.3%2F2014.1.1;hp=b895086202ec86c8de9489249db954b897029545;hpb=ff178ffe2104410be022fafeb28a43d6bddf9bd8;p=openstack-build%2Fneutron-build.git

diff --git a/rpm/SOURCES/neutron-metadata-agent.init b/rpm/SOURCES/neutron-metadata-agent.init
index b89508620..40cc5a1a6 100644
--- a/rpm/SOURCES/neutron-metadata-agent.init
+++ b/rpm/SOURCES/neutron-metadata-agent.init
@@ -18,7 +18,6 @@ configs=(
     "/etc/$proj/metadata_agent.ini" \
 )
 pidfile="/var/run/$proj/$prog.pid"
-logfile="/var/log/$proj/metadata-agent.log"
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
@@ -30,7 +29,7 @@ start() {
         [ -f $config ] || exit 6
     done
     echo -n $"Starting $prog: "
-    daemon --user neutron --pidfile $pidfile "$exec --log-file $logfile ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
+    daemon --user neutron --pidfile $pidfile "$exec --log-file /var/log/$proj/$plugin.log ${configs[@]/#/--config-file } &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
@@ -40,6 +39,11 @@ start() {
 stop() {
     echo -n $"Stopping $prog: "
     killproc -p $pidfile $prog
+    if pgrep $prog &>/dev/null ; then
+        sleep 2
+        pgrep $prog &>/dev/null && \
+        killall $prog
+    fi
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile