Code Review
/
openstack-build
/
neutron-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Added patches init-scripts for kill services
[openstack-build/neutron-build.git]
/
rpm
/
SOURCES
/
neutron-metering-agent.init
diff --git
a/rpm/SOURCES/neutron-metering-agent.init
b/rpm/SOURCES/neutron-metering-agent.init
index 798babaf4cc992b5fb48b0714db8940d969ddb27..22ae1aa98146c2644b2a43ba739dbd44313c4ee3 100644
(file)
--- a/
rpm/SOURCES/neutron-metering-agent.init
+++ b/
rpm/SOURCES/neutron-metering-agent.init
@@
-13,6
+13,7
@@
plugin=metering-agent
prog=$proj-$plugin
exec="/usr/bin/$prog"
configs=(
prog=$proj-$plugin
exec="/usr/bin/$prog"
configs=(
+ "/usr/share/$proj/$proj-dist.conf" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/metering_agent.ini" \
)
"/etc/$proj/$proj.conf" \
"/etc/$proj/metering_agent.ini" \
)
@@
-38,6
+39,11
@@
start() {
stop() {
echo -n $"Stopping $prog: "
killproc -p $pidfile $prog
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
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile