You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2012/09/24 19:29:54 UTC
[8/20] git commit: CLOUDSTACK-81: Fix init script for usage server on
RHEL based platforms
CLOUDSTACK-81: Fix init script for usage server on RHEL based platforms
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e8301132
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e8301132
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e8301132
Branch: refs/heads/4.0
Commit: e8301132e9ba16a3fc5c5d9e487d8827bb93db0d
Parents: 4ab686f
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Mon Sep 24 15:20:17 2012 +0200
Committer: Edison Su <su...@gmail.com>
Committed: Mon Sep 24 10:23:28 2012 -0700
----------------------------------------------------------------------
.../centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 31 ++++++++------
.../fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 31 ++++++++------
.../rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 31 ++++++++------
3 files changed, 54 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e8301132/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in
----------------------------------------------------------------------
diff --git a/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in b/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in
index f968263..69f1b2c 100755
--- a/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in
+++ b/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in
@@ -30,7 +30,7 @@
# specific language governing permissions and limitations
# under the License.
-. /lib/lsb/init-functions
+. /etc/rc.d/init.d/functions
SHORTNAME="cloud-usage"
PIDFILE=@PIDDIR@/"$SHORTNAME".pid
@@ -66,27 +66,26 @@ export CLASSPATH="$SCP:$DCP:$UCP:$JCP:@USAGESYSCONFDIR@"
start() {
if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_daemon_msg "$PROGNAME apparently already running"
- log_end_msg 0
+ echo "$PROGNAME apparently already running"
exit 0
fi
- log_daemon_msg "Starting $PROGNAME" "$SHORTNAME"
if hostname --fqdn >/dev/null 2>&1 ; then
true
else
- log_failure_msg "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
- log_end_msg 1
+ echo "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
exit 1
fi
- if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -outfile SYSLOG -errfile SYSLOG -Dpid=$$ $CLASS
+ echo -n "Starting $PROGNAME" "$SHORTNAME"
+
+ if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -errfile SYSLOG -Dpid=$$ $CLASS
RETVAL=$?
then
rc=0
sleep 1
if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_failure_msg "$PROG failed to start"
+ failure
rc=1
fi
else
@@ -94,18 +93,24 @@ start() {
fi
if [ $rc -eq 0 ]; then
- log_end_msg 0
+ success
else
- log_end_msg 1
+ failure
rm -f "$PIDFILE"
fi
+ echo
}
stop() {
- log_daemon_msg "Stopping $PROGNAME" "$SHORTNAME"
+ echo -n "Stopping $PROGNAME" "$SHORTNAME"
killproc -p $PIDFILE $DAEMON
- log_end_msg $?
+ if [ "$?" -eq 0 ]; then
+ success
+ else
+ failure
+ fi
rm -f "$PIDFILE"
+ echo
}
case "$1" in
@@ -116,7 +121,7 @@ case "$1" in
stop
;;
status)
- status_of_proc -p "$PIDFILE" "$PROG" "$SHORTNAME"
+ status -p $PIDFILE $SHORTNAME
RETVAL=$?
;;
restart | force-reload)
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e8301132/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in
----------------------------------------------------------------------
diff --git a/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in b/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in
index f968263..69f1b2c 100755
--- a/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in
+++ b/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in
@@ -30,7 +30,7 @@
# specific language governing permissions and limitations
# under the License.
-. /lib/lsb/init-functions
+. /etc/rc.d/init.d/functions
SHORTNAME="cloud-usage"
PIDFILE=@PIDDIR@/"$SHORTNAME".pid
@@ -66,27 +66,26 @@ export CLASSPATH="$SCP:$DCP:$UCP:$JCP:@USAGESYSCONFDIR@"
start() {
if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_daemon_msg "$PROGNAME apparently already running"
- log_end_msg 0
+ echo "$PROGNAME apparently already running"
exit 0
fi
- log_daemon_msg "Starting $PROGNAME" "$SHORTNAME"
if hostname --fqdn >/dev/null 2>&1 ; then
true
else
- log_failure_msg "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
- log_end_msg 1
+ echo "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
exit 1
fi
- if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -outfile SYSLOG -errfile SYSLOG -Dpid=$$ $CLASS
+ echo -n "Starting $PROGNAME" "$SHORTNAME"
+
+ if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -errfile SYSLOG -Dpid=$$ $CLASS
RETVAL=$?
then
rc=0
sleep 1
if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_failure_msg "$PROG failed to start"
+ failure
rc=1
fi
else
@@ -94,18 +93,24 @@ start() {
fi
if [ $rc -eq 0 ]; then
- log_end_msg 0
+ success
else
- log_end_msg 1
+ failure
rm -f "$PIDFILE"
fi
+ echo
}
stop() {
- log_daemon_msg "Stopping $PROGNAME" "$SHORTNAME"
+ echo -n "Stopping $PROGNAME" "$SHORTNAME"
killproc -p $PIDFILE $DAEMON
- log_end_msg $?
+ if [ "$?" -eq 0 ]; then
+ success
+ else
+ failure
+ fi
rm -f "$PIDFILE"
+ echo
}
case "$1" in
@@ -116,7 +121,7 @@ case "$1" in
stop
;;
status)
- status_of_proc -p "$PIDFILE" "$PROG" "$SHORTNAME"
+ status -p $PIDFILE $SHORTNAME
RETVAL=$?
;;
restart | force-reload)
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e8301132/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in
----------------------------------------------------------------------
diff --git a/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in b/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in
index f968263..69f1b2c 100644
--- a/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in
+++ b/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in
@@ -30,7 +30,7 @@
# specific language governing permissions and limitations
# under the License.
-. /lib/lsb/init-functions
+. /etc/rc.d/init.d/functions
SHORTNAME="cloud-usage"
PIDFILE=@PIDDIR@/"$SHORTNAME".pid
@@ -66,27 +66,26 @@ export CLASSPATH="$SCP:$DCP:$UCP:$JCP:@USAGESYSCONFDIR@"
start() {
if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_daemon_msg "$PROGNAME apparently already running"
- log_end_msg 0
+ echo "$PROGNAME apparently already running"
exit 0
fi
- log_daemon_msg "Starting $PROGNAME" "$SHORTNAME"
if hostname --fqdn >/dev/null 2>&1 ; then
true
else
- log_failure_msg "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
- log_end_msg 1
+ echo "The host name does not resolve properly to an IP address. Cannot start $PROGNAME"
exit 1
fi
- if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -outfile SYSLOG -errfile SYSLOG -Dpid=$$ $CLASS
+ echo -n "Starting $PROGNAME" "$SHORTNAME"
+
+ if start_daemon -p $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -errfile SYSLOG -Dpid=$$ $CLASS
RETVAL=$?
then
rc=0
sleep 1
if ! kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
- log_failure_msg "$PROG failed to start"
+ failure
rc=1
fi
else
@@ -94,18 +93,24 @@ start() {
fi
if [ $rc -eq 0 ]; then
- log_end_msg 0
+ success
else
- log_end_msg 1
+ failure
rm -f "$PIDFILE"
fi
+ echo
}
stop() {
- log_daemon_msg "Stopping $PROGNAME" "$SHORTNAME"
+ echo -n "Stopping $PROGNAME" "$SHORTNAME"
killproc -p $PIDFILE $DAEMON
- log_end_msg $?
+ if [ "$?" -eq 0 ]; then
+ success
+ else
+ failure
+ fi
rm -f "$PIDFILE"
+ echo
}
case "$1" in
@@ -116,7 +121,7 @@ case "$1" in
stop
;;
status)
- status_of_proc -p "$PIDFILE" "$PROG" "$SHORTNAME"
+ status -p $PIDFILE $SHORTNAME
RETVAL=$?
;;
restart | force-reload)