Revert "Make sure initial log messages go somewhere for agent and usage"

The dreaded wrong-tree-active-syndrome

This reverts commit 9589f9fe5f401df90f7b356c9186d012c8f887ab.
This commit is contained in:
Hugo Trippaers 2013-02-15 15:50:09 +01:00 committed by Edison Su
parent ae902590d3
commit 9b5774363d
2 changed files with 4 additions and 6 deletions

View File

@ -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

View File

@ -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