This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a commit to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/CLOUDSTACK-10012 by this push:
new 7652cab packaging: fix debian init script
7652cab is described below
commit 7652cabb6770dca117108c0492ba521dffe3f57a
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Tue Aug 8 12:29:19 2017 +0200
packaging: fix debian init script
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
---
packaging/debian/init/cloud-management | 79 ++++++----------------------------
1 file changed, 13 insertions(+), 66 deletions(-)
diff --git a/packaging/debian/init/cloud-management
b/packaging/debian/init/cloud-management
index 154d2ca..439cffb 100755
--- a/packaging/debian/init/cloud-management
+++ b/packaging/debian/init/cloud-management
@@ -34,17 +34,11 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
NAME=cloudstack-management
DESC="CloudStack Management Server"
DAEMON=/usr/bin/jsvc
-MANAGEMENT_HOME=/usr/share/$NAME
-MANAGEMENT_CONFIG="/etc/cloudstack/management"
-JVM_TMP=/tmp/$NAME-temp
+DEFAULT=/etc/default/$NAME
USER="cloud"
GROUP="cloud"
-UBER_JAR="$MANAGEMENT_HOME/cloud-management-server.jar"
-BOOTSTRAP_CLASS="org.apache.cloudstack.ServerDaemon"
-MANAGEMENT_PID="/var/run/$NAME.pid"
-JARS=$(ls $MANAGEMENT_HOME/lib/*.jar | tr '\n' ':' | sed s'/.$//')
-JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$JARS:$MANAGEMENT_CONFIG:/usr/share/$NAME/setup:$MANAGEMENT_HOME:$UBER_JAR"
-
+CLOUDSTACK_PID="/var/run/$NAME.pid"
+JARS=$(ls /usr/share/cloudstack-management/lib/*.jar | tr '\n' ':' | sed
s'/.$//')
# We have to explicitly set the HOME variable to the homedir from the user
"cloud"
# This is because various scripts run by the management server read the HOME
variable
@@ -65,9 +59,6 @@ fi
. /lib/lsb/init-functions
. /etc/default/rcS
-
-# The following variables can be overwritten in $DEFAULT
-
# The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
# defined in $DEFAULT)
JDK_DIRS="/usr/lib/jvm/java-8-openjdk-amd64 /usr/lib/jvm/java-8-openjdk-i386
/usr/lib/jvm/java-8-oracle /usr/lib/jvm/java-8-openjdk"
@@ -80,41 +71,12 @@ for jdir in $JDK_DIRS; do
done
export JAVA_HOME
-# Directory for per-instance configuration files and webapps
-CATALINA_BASE=/usr/share/cloudstack-management
-
-# Default Java options
-# Set java.awt.headless=true if JAVA_OPTS is not set so the
-# Xalan XSL transformer can work without X11 display on JDK 1.4+
-# It also looks like the default heap size of 64M is not enough for most cases
-# so the maximum heap size is set to 128M
-if [ -z "$JAVA_OPTS" ]; then
- JAVA_OPTS="-Djava.awt.headless=true -Xmx128M"
-fi
-
-# End of variables that can be overwritten in $DEFAULT
-
# overwrite settings from default file
if [ -f "$DEFAULT" ]; then
. "$DEFAULT"
fi
-if [ ! -f "$CATALINA_HOME/bin/bootstrap.jar" ]; then
- log_failure_msg "$NAME is not installed"
- exit 1
-fi
-
[ -f "$DAEMON" ] || exit 0
-[ -r "$UBER_JAR" ] || exit 0
-[ -d "$MANAGEMENT_CONFIG" ] || exit 0
-
-JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=$JVM_TMP"
-
-# Load extra arguments from java-opts.conf if any
-if [ -r "$MANAGEMENT_CONFIG/java-opts.conf" ]; then
- JAVA_EXTRA_OPTS=$(cat $MANAGEMENT_CONFIG/java-opts.conf)
- JAVA_OPTS="$JAVA_OPTS $JAVA_EXTRA_OPTS"
-fi
# Look for Java Secure Sockets Extension (JSSE) JARs
if [ -z "${JSSE_HOME}" -a -r "${JAVA_HOME}/jre/lib/jsse.jar" ]; then
@@ -130,23 +92,16 @@ case "$1" in
fi
log_daemon_msg "Starting $DESC" "$NAME"
- if start-stop-daemon --test --start --quiet --pidfile "$MANAGEMENT_PID"
\
+ if start-stop-daemon --test --start --quiet --pidfile "$CLOUDSTACK_PID"
\
--user $USER --startas "$JAVA_HOME/bin/java"; then
- # Remove / recreate JVM_TMP directory
- rm -rf "$JVM_TMP"
- mkdir "$JVM_TMP" || {
- log_failure_msg "could not create JVM temporary
directory"
- exit 1
- }
-
# fix storage issues on nfs mounts
umask 000
- start-stop-daemon --start --quiet --pidfile "$MANAGEMENT_PID" \
+ start-stop-daemon --start --quiet --pidfile "$CLOUDSTACK_PID" \
--user $USER --group $GROUP --exec $DAEMON -- -user "$USER"
-server \
- -home "$JAVA_HOME" -cp "$JSVC_CLASSPATH" \
- -outfile SYSLOG -errfile SYSLOG \
- -pidfile "$MANAGEMENT_PID" $JAVA_OPTS "$BOOTSTRAP_CLASS"
+ -home "$JAVA_HOME" -cp "$JARS:$CLASSPATH" \
+ -outfile SYSLOG -errfile $LOGDIR/$NAME.err \
+ -pidfile "$CLOUDSTACK_PID" $JAVA_OPTS "$BOOTSTRAP_CLASS"
log_end_msg $?
else
log_progress_msg "(already running)"
@@ -155,18 +110,17 @@ case "$1" in
;;
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
- start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile
"$MANAGEMENT_PID"
+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile
"$CLOUDSTACK_PID"
RETVAL="$?"
[ "$RETVAL" = 2 ] && return 2
- [ "$RETVAL" = 0 ] && rm -rf "$JVM_TMP"
log_end_msg 0
;;
status)
- if start-stop-daemon --test --start --pidfile "$$MANAGEMENT_PID" \
+ if start-stop-daemon --test --start --pidfile "$CLOUDSTACK_PID" \
--user $USER --startas "$JAVA_HOME/bin/java" \
>/dev/null; then
- if [ -f "$$MANAGEMENT_PID" ]; then
+ if [ -f "$CLOUDSTACK_PID" ]; then
log_success_msg "$DESC is not running, but pid file exists."
exit 1
else
@@ -174,11 +128,11 @@ case "$1" in
exit 3
fi
else
- log_success_msg "$DESC is running with pid `cat
$$MANAGEMENT_PID`"
+ log_success_msg "$DESC is running with pid `cat
$CLOUDSTACK_PID`"
fi
;;
restart|force-reload)
- if start-stop-daemon --test --stop --pidfile "$$MANAGEMENT_PID" \
+ if start-stop-daemon --test --stop --pidfile "$CLOUDSTACK_PID" \
--user $USER --startas "$JAVA_HOME/bin/java" \
>/dev/null; then
$0 stop
@@ -186,13 +140,6 @@ case "$1" in
fi
$0 start
;;
- try-restart)
- if start-stop-daemon --test --start --pidfile "$CATALINA_PID" \
- --user $TOMCAT6_USER --startas "$JAVA_HOME/bin/java" \
- >/dev/null; then
- $0 start
- fi
- ;;
*)
log_success_msg "Usage: $0
{start|stop|restart|try-restart|force-reload|status}"
exit 1
--
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].
