init: log_process_msg doesn't work, so use log_daemon_msg for that.

wido · wido · commit ae60cd7b87c3 · 2012-07-25T14:56:30.000+02:00
We also exit earlier, we don't display that we are even trying to start.

When we detect the agent is already running we exit right away with a message.
diff --git a/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in b/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in
@@ -37,7 +37,7 @@ SHORTNAME="cloud-agent"
 PIDFILE=@PIDDIR@/"$SHORTNAME".pid
 LOCKFILE=@LOCKDIR@/"$SHORTNAME"
 LOGFILE=@AGENTLOG@
-PROGNAME="Cloud Agent"
+PROGNAME="CloudStack Agent"
 CLASS="com.cloud.agent.AgentShell"
 PROG="jsvc"
 DAEMON="/usr/bin/jsvc"
@@ -82,13 +82,13 @@ wait_for_network() {
 }
 
 start() {
-    log_daemon_msg "Starting $PROGNAME" "$SHORTNAME"
     if [ -s "$PIDFILE" ] && kill -0 $(cat "$PIDFILE") >/dev/null 2>&1; then
-          log_progress_msg "apparently already running"
-          log_end_msg 0
-          exit 0
+        log_daemon_msg "$PROGNAME apparently already running"
+        log_end_msg 0
+        exit 0
     fi
 
+    log_daemon_msg "Starting $PROGNAME" "$SHORTNAME"
     if hostname --fqdn >/dev/null 2>&1 ; then
         true
     else
