Skip to content
Browse files

fix output msg; fix usage.

SVN Revision: 609
  • Loading branch information...
1 parent 4e5c89d commit c65d43c4f1f5785042ab5b42dfa651ffb1543400 @nniclausse nniclausse committed Dec 5, 2005
Showing with 14 additions and 3 deletions.
  1. +1 −1 src/tsung_controller/tsung_controller.erl
  2. +13 −2 tsung.sh.in
View
2 src/tsung_controller/tsung_controller.erl
@@ -96,7 +96,7 @@ status([Host]) when is_atom(Host)->
{_, error, _,_} ->
"Tsung is initializing, please wait ...";
{'EXIT', {noproc, _}} ->
- "Tsung is not started [ERROR]"
+ "Tsung is not started"
end,
io:format("~s~n",[Msg]).
View
15 tsung.sh.in
@@ -43,6 +43,15 @@ stop_recorder() {
rm $PIDFILE
}
+recorder_status() {
+ PIDFILE="/tmp/tsung_recorder.pid"
+ if [ -f $PIDFILE ]; then
+ echo "Tsung recorder started [OK]"
+ else
+ echo "Tsung recorder not started "
+ fi
+}
+
checkversion() {
if [ $ERTS_RUN != $ERTS_BOOT ]
then
@@ -125,7 +134,7 @@ status() {
checkrunning_controller() {
RES=`status`
- if [ "$RES" != "Tsung is not started [ERROR]" ]; then
+ if [ "$RES" != "Tsung is not started" ]; then
echo "Tsung is already running, exit."
exit 1
fi
@@ -142,8 +151,9 @@ checkrunning(){
}
usage() {
- prog=`basename $1`
+ prog=`basename $0`
echo "$prog start|stop|restart|debug|status|recorder|stop_recorder|version"
+ exit
}
while getopts ":f:p:l:d:r:" Option
@@ -197,6 +207,7 @@ case $1 in
;;
status)
+ recorder_status
status
;;

0 comments on commit c65d43c

Please sign in to comment.
Something went wrong with that request. Please try again.