mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-23 05:04:56 +09:00
M #~: Don't kill with SIGABRT but SIGTERM (#4391)
This commit is contained in:
1 parent
dfcb513178
commit
91b2263aba
5 files changed
+6
-6
No files matched your search
@@ -22,7 +22,7 @@ running_pid=$(cat /tmp/one-monitord-client.pid)
|
||||
pids=$(ps axuwww | grep -e /monitord-client.rb| grep -v grep | awk '{ print $2 }' | grep -v "^${running_pid}$")
|
||||
|
||||
if [ -n "$pids" ]; then
|
||||
kill -6 $pids
|
||||
kill $pids
|
||||
fi
|
||||
|
||||
) > /dev/null
|
||||
|
||||
@@ -31,13 +31,13 @@ pids=$(ps axuwww | grep -e "/monitord-client.rb.*${HID} " | grep -v grep | \
|
||||
awk '{ print $2 }' | grep -v "^${running_pid}$")
|
||||
|
||||
if [ -n "$pids" ]; then
|
||||
kill -6 $pids
|
||||
kill $pids
|
||||
fi
|
||||
|
||||
oned=`ps auxwww | grep oned | grep -v grep | wc -l`
|
||||
|
||||
if [ ${oned} -eq 0 ]; then
|
||||
kill -6 ${running_pid}
|
||||
kill ${running_pid}
|
||||
fi
|
||||
|
||||
) > /dev/null
|
||||
|
||||
@@ -61,7 +61,7 @@ function stop_client() {
|
||||
local pids=$(ps axuww | grep "$CLIENT $ARGV" | grep -v grep | awk '{print $2}')
|
||||
|
||||
if [ -n "$pids" ]; then
|
||||
kill -6 $pids
|
||||
kill $pids
|
||||
fi
|
||||
|
||||
rm -f $CLIENT_PID_FILE
|
||||
|
||||
@@ -22,7 +22,7 @@ running_pid=$(cat /tmp/one-monitord-client.pid)
|
||||
pids=$(ps axuwww | grep -e "/monitord-client.rb kvm" | grep -v grep | awk '{ print $2 }' | grep -v "^${running_pid}$")
|
||||
|
||||
if [ -n "$pids" ]; then
|
||||
kill -6 $pids
|
||||
kill $pids
|
||||
fi
|
||||
|
||||
) > /dev/null
|
||||
|
||||
@@ -22,7 +22,7 @@ running_pid=$(cat /tmp/one-monitord-client.pid)
|
||||
pids=$(ps axuwww | grep -e "/monitord-client.rb lxd" | grep -v grep | awk '{ print $2 }' | grep -v "^${running_pid}$")
|
||||
|
||||
if [ -n "$pids" ]; then
|
||||
kill -6 $pids
|
||||
kill $pids
|
||||
fi
|
||||
|
||||
) > /dev/null
|
||||
|
||||
Reference in new issue
Block a user