mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Summary: packaging updates
Empty paths lead to unpleasant surpises later on Use basename to find the pid file when stopping tomcat
This commit is contained in:
parent
0ff6612f7f
commit
0cc4636a2d
@ -46,8 +46,8 @@ NAME="$(basename $0)"
|
||||
stop() {
|
||||
SHUTDOWN_WAIT="30"
|
||||
count="0"
|
||||
if [ -f /var/run/cloud-management.pid ]; then
|
||||
pid=`cat /var/run/cloud-management.pid`
|
||||
if [ -f /var/run/${NAME}.pid ]; then
|
||||
pid=`cat /var/run/${NAME}.pid`
|
||||
kill $pid &>/dev/null
|
||||
until [ "$(ps --pid $pid | grep -c $pid)" -eq "0" ] || \
|
||||
[ "$count" -gt "$SHUTDOWN_WAIT" ]
|
||||
@ -78,8 +78,8 @@ set_ulimit() {
|
||||
|
||||
handle_pid_file() {
|
||||
if [ "$1" -ne 0 ] ; then
|
||||
echo "The pid file locates at /var/run/cloud-management.pid and lock file at /var/lock/subsys/cloud-management.
|
||||
Starting cloud-management will take care of them or you can manually clean up."
|
||||
echo "The pid file locates at /var/run/${NAME}.pid and lock file at /var/lock/subsys/${NAME}.
|
||||
Starting ${NAME} will take care of them or you can manually clean up."
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@ -48,8 +48,8 @@ MSLOGDIR=/var/log/cloudstack/management/
|
||||
MSMNTDIR=/var/lib/cloud/mnt
|
||||
MSUSER=cloud
|
||||
PIDDIR=/var/run
|
||||
PLUGINJAVADIR=
|
||||
PREMIUMJAVADIR=
|
||||
PLUGINJAVADIR=/usr/share/cloudstack-management/plugin
|
||||
PREMIUMJAVADIR=/usr/share/cloudstack-management/premium
|
||||
PYTHONDIR=/usr/lib/python2.6/site-packages/
|
||||
SERVERSYSCONFDIR=/etc/sysconfig
|
||||
SETUPDATADIR=/usr/share/cloudstack-management/setup
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user