use logdir instead of logfile option

mbbx6spp · Sep 16, 2011 · de568f3 · de568f3
1 parent a5156e7
commit de568f3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/doc/user_manual.html b/doc/user_manual.html
@@ -96,7 +96,7 @@
 <!--CUT DEF section 1 --><H1 ALIGN=center>Tsung User’s manual</H1><DIV CLASS="center">
 
 <TABLE BORDER=1 CELLSPACING=0 CELLPADDING=1><TR><TD ALIGN=left NOWRAP bgcolor="#F2F2F2"> Version:</TD><TD ALIGN=left NOWRAP>1.4.1</TD></TR>
-<TR><TD ALIGN=left NOWRAP bgcolor="#F2F2F2"> Date :</TD><TD ALIGN=left NOWRAP>September 14, 2011</TD></TR>
+<TR><TD ALIGN=left NOWRAP bgcolor="#F2F2F2"> Date :</TD><TD ALIGN=left NOWRAP>September 16, 2011</TD></TR>
 </TABLE>
 </DIV><!--TOC section Contents-->
 <H2 CLASS="section"><!--SEC ANCHOR -->Contents</H2><!--SEC END --><UL CLASS="toc"><LI CLASS="li-toc">
@@ -475,7 +475,7 @@ <H3 CLASS="subsection"><!--SEC ANCHOR --><A NAME="htoc19">3.4</A>  Running</H3
 Usage: tsung &lt;options&gt; start|stop|debug|status
 Options:
     -f &lt;file&gt;     set configuration file (default is ~/.tsung/tsung.xml)
-    -l &lt;logfile&gt;  set log file (default is ~/.tsung/log/tsung.log)
+    -l &lt;logdir&gt;   set log directory (default is ~/.tsung/log/YYYYMMDD-HHxMM/)
     -i &lt;id&gt;       set controller id (default is empty)
     -r &lt;command&gt;  set remote connector (default is ssh)
     -F            use long names (FQDN) for erlang nodes

diff --git a/doc/user_manual.tex b/doc/user_manual.tex
@@ -355,7 +355,7 @@ \subsection{Running}
 Usage: tsung <options> start|stop|debug|status
 Options:
     -f <file>     set configuration file (default is ~/.tsung/tsung.xml)
-    -l <logfile>  set log file (default is ~/.tsung/log/tsung.log)
+    -l <logdir>   set log directory (default is ~/.tsung/log/YYYYMMDD-HHxMM/)
     -i <id>       set controller id (default is empty)
     -r <command>  set remote connector (default is ssh)
     -F            use long names (FQDN) for erlang nodes

diff --git a/tsung.sh.in b/tsung.sh.in
@@ -130,7 +130,7 @@ usage() {
     echo "Usage: $prog <options> start|stop|debug|status"
     echo "Options:"
     echo "    -f <file>     set configuration file (default is ~/.tsung/tsung.xml)"
-    echo "    -l <logfile>  set log file (default is ~/.tsung/log/YYYYMMDD-HHxMM/tsung.log)"
+    echo "    -l <logdir>   set log directory (default is ~/.tsung/log/YYYYMMDD-HHxMM/)"
     echo "    -i <id>       set controller id (default is empty)"
     echo "    -r <command>  set remote connector (default is ssh)"
     echo "    -s            enable erlang smp on client nodes"
@@ -149,9 +149,9 @@ do
             echo "$OPTARG" | grep -q "^/"
             RES=$?
             if [ "$RES" == 0 ]; then
-                LOG_OPT="log_file \"$OPTARG\" "
+                LOG_OPT="log_file \"$OPTARG/tsung.log\" "
             else
-                LOG_OPT="log_file \"$PWD/$OPTARG\" "
+                LOG_OPT="log_file \"$PWD/$OPTARG/tsung.log\" "
             fi
             ;;
         d) DEBUG_LEVEL=$OPTARG;;