Merge pull request #7002 from richardkchapman/logfile-format

HPCC-2403 Log format still old in Roxie command line

Reviewed-By: Michael Gardner <michael.gardner@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

initfiles/bin/init_roxie

@@ -52,7 +52,7 @@ killed() {
 }
 
 trap "killed" SIGINT SIGTERM SIGKILL
-nohup roxie --topology=RoxieTopology.xml --logfile=$logfilename --restarts=$restarts --stdlog=0 2>>$logfilename.stderr 1>>$logfilename.stdout &
+nohup roxie --topology=RoxieTopology.xml --logfile --restarts=$restarts --stdlog=0 2>>$logfilename.stderr 1>>$logfilename.stdout &
 echo $! > $PID_NAME 
 wait
 rm $PID_NAME
@@ -62,7 +62,7 @@ while [ -e ${SENTINEL} ]; do
     export restarts=$(($restarts+1))
     echo Restarting $restarts >> $logfilename.stderr
     echo Restarting $restarts >> $logfilename.stdout
-    nohup roxie --topology=RoxieTopology.xml --logfile=$logfilename --restarts=$restarts --stdlog=0 2>>$logfilename.stderr 1>>$logfilename.stdout &
+    nohup roxie --topology=RoxieTopology.xml --logfile --restarts=$restarts --stdlog=0 2>>$logfilename.stderr 1>>$logfilename.stdout &
     echo $! > $PID_NAME
     wait
     rm $PID_NAME

roxie/ccd/ccdmain.cpp

@@ -356,7 +356,7 @@ static void roxie_common_usage(const char * progName)
     printf("\t--daliServers=[host1,...]\t: List of Dali servers to use\n");
     printf("\t--tracelevel=[integer]\t: Amount of information to dump on logs\n");
     printf("\t--stdlog=[boolean]\t: Standard log format (based on tracelevel)\n");
-    printf("\t--logfile=[format]\t: Outputs to logfile, rather than stdout\n");
+    printf("\t--logfile\t: Outputs to logfile, rather than stdout\n");
     printf("\t--help|-h\t: This message\n");
     printf("\n");
 }

roxie/roxie/roxie.cpp

@@ -37,7 +37,7 @@ static void roxie_server_usage()
     printf("\t--daliServers=[host1,...]\t: List of Dali servers to use\n");
     printf("\t--tracelevel=[integer]\t: Amount of information to dump on logs\n");
     printf("\t--stdlog=[boolean]\t: Standard log format (based on tracelevel)\n");
-    printf("\t--logfile=[format]\t: Outputs to logfile, rather than stdout\n");
+    printf("\t--logfile\t: Outputs to logfile, rather than stdout\n");
     printf("\t--help|-h\t: This message\n");
     printf("\n");
 }