mirror of
https://github.com/apache/cloudstack.git
synced 2025-12-16 02:22:52 +01:00
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:
parent
ae902590d3
commit
9b5774363d
@ -31,8 +31,7 @@ whatami=cloudstack-agent
|
|||||||
SHORTNAME="$whatami"
|
SHORTNAME="$whatami"
|
||||||
PIDFILE=/var/run/"$whatami".pid
|
PIDFILE=/var/run/"$whatami".pid
|
||||||
LOCKFILE=/var/lock/subsys/"$SHORTNAME"
|
LOCKFILE=/var/lock/subsys/"$SHORTNAME"
|
||||||
LOGDIR=/var/log/cloudstack/agent
|
LOGFILE=/var/log/cloudstack/agent/agent.log
|
||||||
LOGFILE=${LOGFIR}/agent.log
|
|
||||||
PROGNAME="Cloud Agent"
|
PROGNAME="Cloud Agent"
|
||||||
CLASS="com.cloud.agent.AgentShell"
|
CLASS="com.cloud.agent.AgentShell"
|
||||||
JSVC=`which jsvc 2>/dev/null`;
|
JSVC=`which jsvc 2>/dev/null`;
|
||||||
@ -68,7 +67,7 @@ export CLASSPATH="$SCP:$DCP:$ACP:$JCP:/etc/cloudstack/agent:/usr/share/cloudstac
|
|||||||
start() {
|
start() {
|
||||||
echo -n $"Starting $PROGNAME: "
|
echo -n $"Starting $PROGNAME: "
|
||||||
if hostname --fqdn >/dev/null 2>&1 ; then
|
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=$?
|
RETVAL=$?
|
||||||
echo
|
echo
|
||||||
else
|
else
|
||||||
|
|||||||
@ -35,8 +35,7 @@
|
|||||||
SHORTNAME="cloudstack-usage"
|
SHORTNAME="cloudstack-usage"
|
||||||
PIDFILE=/var/run/"$SHORTNAME".pid
|
PIDFILE=/var/run/"$SHORTNAME".pid
|
||||||
LOCKFILE=/var/lock/subsys/"$SHORTNAME"
|
LOCKFILE=/var/lock/subsys/"$SHORTNAME"
|
||||||
LOGDIR=/var/log/cloudstack/usage
|
LOGFILE=/var/log/cloudstack/usage/usage.log
|
||||||
LOGFILE=${LOGDIR}/usage.log
|
|
||||||
PROGNAME="CloudStack Usage Monitor"
|
PROGNAME="CloudStack Usage Monitor"
|
||||||
CLASS="com.cloud.usage.UsageServer"
|
CLASS="com.cloud.usage.UsageServer"
|
||||||
PROG="jsvc"
|
PROG="jsvc"
|
||||||
@ -80,7 +79,7 @@ start() {
|
|||||||
|
|
||||||
echo -n "Starting $PROGNAME" "$SHORTNAME"
|
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=$?
|
RETVAL=$?
|
||||||
then
|
then
|
||||||
rc=0
|
rc=0
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user