diff --git a/tsung.sh.in b/tsung.sh.in index 4e310da8c..6a1ac9dbe 100755 --- a/tsung.sh.in +++ b/tsung.sh.in @@ -26,7 +26,7 @@ RECORDERPATH=$INSTALL_DIR/lib/tsung_recorder-$VERSION/ebin CONF_OPT_FILE="$HOME/.tsung/tsung.xml" BOOT_OPT="-boot $INSTALL_DIR/lib/tsung_controller-$VERSION/priv/tsung_controller -boot_var TSUNGPATH $INSTALL_DIR " REC_BOOT_OPT="-boot $INSTALL_DIR/lib/tsung_recorder-$VERSION/priv/tsung_recorder -boot_var TSUNGPATH $INSTALL_DIR " -REC_DEBUG_LEVEL=5 +DEBUG_LEVEL=5 RECORDER_PLUGIN="http" ERL_RSH=" -rsh ssh " ERL_OPTS=" +A 1 @ERL_OPTS@ " @@ -77,6 +77,7 @@ start() { echo "Starting Tsung" $ERL $ERL_OPTS $ERL_RSH -noshell -sname $CONTROLLER -setcookie $COOKIE $BOOT_OPT \ -pa $TSUNGPATH -pa $CONTROLLERPATH \ + -tsung_controller debug_level $DEBUG_LEVEL \ -tsung_controller config_file \"$CONF_OPT_FILE\" -tsung_controller $LOG_OPT } @@ -84,7 +85,7 @@ recorder() { echo "Starting Tsung recorder on port $LISTEN_PORT" $ERL $ERL_OPTS $ERL_RSH -noshell -sname $RECORDER -setcookie $COOKIE $REC_BOOT_OPT \ -pa $TSUNGPATH -pa $RECORDERPATH -pa $CONTROLLERPATH \ - -tsung_recorder debug_level $REC_DEBUG_LEVEL \ + -tsung_recorder debug_level $DEBUG_LEVEL \ -tsung_recorder $LOG_OPT \ -tsung_recorder plugin ts_proxy_$RECORDER_PLUGIN \ -tsung_recorder proxy_log_file \"$MAIN_DIR/tsung_recorder.xml\" \ @@ -161,7 +162,7 @@ do case $Option in f) CONF_OPT_FILE=$OPTARG;; l) LOG_OPT="log_file \"$OPTARG\" ";; - d) REC_DEBUG_LEVEL=$OPTARG;; + d) DEBUG_LEVEL=$OPTARG;; r) ERL_RSH=" -rsh $OPTARG ";; p) RECORDER_PLUGIN=$OPTARG;; *) usage ;;