Simplify startup with one parameter less

[aquarium] / scripts / aquarium.sh

diff --git a/scripts/aquarium.sh b/scripts/aquarium.sh
index ed38102..be90a2c 100755 (executable)
--- a/scripts/aquarium.sh
+++ b/scripts/aquarium.sh
@@ -68,7 +68,7 @@ PRGDIR=`dirname "$PRG"`
 
 # Only set supported environment variables if not already set
 [ -z "$AQUARIUM_HOME" ] && AQUARIUM_HOME=`cd "$PRGDIR/.." >/dev/null; pwd`
-[ -z "$AQUARIUM_PROP" ] && AQUARIUM_PROP="-Dlog4j.debug=true"
+[ -z "$AQUARIUM_PROP" ] && AQUARIUM_PROP=""
 [ -z "$AQUARIUM_OPTS" ] && AQUARIUM_OPTS=""
 [ -z "$JAVA_OPTS" ]     && JAVA_OPTS="-Xms1024M -Xmx4096M"
 
@@ -118,17 +118,17 @@ start() {
 
     echo "Starting Aquarium"
 
-    # load log4j from classpath
-    CLASSPATH=$AQUARIUM_CONF:$JBOOT_JAR
+    # CLASSPATH=$AQUARIUM_CONF:$JBOOT_JAR
+    CLASSPATH=$JBOOT_JAR
 
     echo "Using initial CLASSPATH $CLASSPATH"
     echo "Using AQUARIUM_HOME $AQUARIUM_HOME"
     echo "Using MAIN $AQUARIUM_MAIN_CLASS"
     echo "Using AQUARIUM_PROP $AQUARIUM_PROP"
     echo "Using JAVA_OPTS $JAVA_OPTS"
-    echo "nohup java $JAVA_OPTS -cp $CLASSPATH $AQUARIUM_PROP $JBOOT_MAIN_CLASS -debug -lib $AQUARIUM_LIB $AQUARIUM_MAIN_CLASS > $AQUARIUM_LOGFILE"
+    echo "nohup java $JAVA_OPTS -cp $CLASSPATH $AQUARIUM_PROP $JBOOT_MAIN_CLASS -lib $AQUARIUM_LIB $AQUARIUM_MAIN_CLASS > $AQUARIUM_LOGFILE"
 
-    nohup java $JAVA_OPTS -cp $CLASSPATH $AQUARIUM_PROP $JBOOT_MAIN_CLASS -debug -lib $AQUARIUM_LIB $AQUARIUM_MAIN_CLASS > $AQUARIUM_LOGFILE 2>&1 &
+    nohup java $JAVA_OPTS -cp $CLASSPATH $AQUARIUM_PROP $JBOOT_MAIN_CLASS -lib $AQUARIUM_LIB $AQUARIUM_MAIN_CLASS > $AQUARIUM_LOGFILE 2>&1 &
     echo $! > $PID
     echo "OK [pid = "`cat $PID`"]"
 }
@@ -175,8 +175,11 @@ case "$1" in
         stop
         start
         ;;
+    ps)
+        ps -ef | grep java | grep gr.grnet.aquarium.Main
+        ;;
     *)
-        echo "Usage: $0 {start|stop|restart|status}"
+        echo "Usage: $0 {start|stop|restart|status|ps}"
         exit 1
 esac