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-l3-agent.init
diff --git
a/rpm/SOURCES/neutron-l3-agent.init
b/rpm/SOURCES/neutron-l3-agent.init
index d37eea61cba1de1145be2c41e35af1c67b75f892..b96b0f168a606f86f12b661595a7cabaac556a69 100644
(file)
--- a/
rpm/SOURCES/neutron-l3-agent.init
+++ b/
rpm/SOURCES/neutron-l3-agent.init
@@
-13,11
+13,12
@@
plugin=l3-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/l3_agent.ini" \
"/etc/$proj/$proj.conf" \
"/etc/$proj/l3_agent.ini" \
+ "/etc/$proj/fwaas_driver.ini" \
)
pidfile="/var/run/$proj/$prog.pid"
)
pidfile="/var/run/$proj/$prog.pid"
-logfile="/var/log/$proj/l3-agent.log"
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
@@
-29,7
+30,7
@@
start() {
[ -f $config ] || exit 6
done
echo -n $"Starting $prog: "
[ -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
retval=$?
echo
[ $retval -eq 0 ] && touch $lockfile
@@
-39,6
+40,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