Updated Branches: refs/heads/master 825c1c17a -> 1dd40518a refs/heads/storage_refactor 9589f9fe5 -> 123541347
Revert "Make sure initial log messages go somewhere for agent and usage" The dreaded wrong-tree-active-syndrome This reverts commit 9589f9fe5f401df90f7b356c9186d012c8f887ab. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/12354134 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/12354134 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/12354134 Branch: refs/heads/storage_refactor Commit: 1235413476485a32afd432b2f3c2b2a96864c831 Parents: 9589f9f Author: Hugo Trippaers <[email protected]> Authored: Fri Feb 15 15:50:09 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Fri Feb 15 15:50:09 2013 +0100 ---------------------------------------------------------------------- packaging/centos63/cloud-agent.rc | 5 ++--- packaging/centos63/cloud-usage.rc | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/12354134/packaging/centos63/cloud-agent.rc ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc index 19782b7..acf8131 100755 --- a/packaging/centos63/cloud-agent.rc +++ b/packaging/centos63/cloud-agent.rc @@ -31,8 +31,7 @@ whatami=cloudstack-agent SHORTNAME="$whatami" PIDFILE=/var/run/"$whatami".pid LOCKFILE=/var/lock/subsys/"$SHORTNAME" -LOGDIR=/var/log/cloudstack/agent -LOGFILE=${LOGFIR}/agent.log +LOGFILE=/var/log/cloudstack/agent/agent.log PROGNAME="Cloud Agent" CLASS="com.cloud.agent.AgentShell" JSVC=`which jsvc 2>/dev/null`; @@ -68,7 +67,7 @@ export CLASSPATH="$SCP:$DCP:$ACP:$JCP:/etc/cloudstack/agent:/usr/share/cloudstac start() { echo -n $"Starting $PROGNAME: " if hostname --fqdn >/dev/null 2>&1 ; then - $JSVC -cp "$CLASSPATH" -outfile "${LOGDIR}/cloudstack-agent.out" -errfile "${LOGDIR}/cloudstack-agent.err" -pidfile "$PIDFILE" $CLASS + $JSVC -cp "$CLASSPATH" -pidfile "$PIDFILE" $CLASS RETVAL=$? echo else http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/12354134/packaging/centos63/cloud-usage.rc ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud-usage.rc b/packaging/centos63/cloud-usage.rc index dc97cd3..8bee5ae 100755 --- a/packaging/centos63/cloud-usage.rc +++ b/packaging/centos63/cloud-usage.rc @@ -35,8 +35,7 @@ SHORTNAME="cloudstack-usage" PIDFILE=/var/run/"$SHORTNAME".pid LOCKFILE=/var/lock/subsys/"$SHORTNAME" -LOGDIR=/var/log/cloudstack/usage -LOGFILE=${LOGDIR}/usage.log +LOGFILE=/var/log/cloudstack/usage/usage.log PROGNAME="CloudStack Usage Monitor" CLASS="com.cloud.usage.UsageServer" PROG="jsvc" @@ -80,7 +79,7 @@ start() { echo -n "Starting $PROGNAME" "$SHORTNAME" - if daemon --pidfile $PIDFILE $DAEMON -cp "$CLASSPATH" -outfile "${LOGDIR}/cloudstack-usage.out" -errfile "${LOGDIR}/cloudstack-usage.err" -pidfile "$PIDFILE" -user "$USER" -Dpid=$$ $CLASS + if daemon --pidfile $PIDFILE $DAEMON -cp "$CLASSPATH" -pidfile "$PIDFILE" -user "$USER" -errfile SYSLOG -Dpid=$$ $CLASS RETVAL=$? then rc=0
