feat: log-level control in run-clara

Author: c-dilks

bin/run-clara

@@ -15,19 +15,23 @@ Options:\n
 \t-n   number of events (default=-1)\n
 \t-m   merge output files (see dependencies below)\n
 \t-l   larger JVM memory requests\n
-\t-v   verbose output\n
+\t-L   set Java log level (e.g., info, fine, etc.)\n
+\t-q   quiet output (overrides -L)\n
+\t-v   verbose output (xtrace)\n
 \t-h   print this help and exit\n\n
 Merging outputs (-m) requires hipo-utils and yq (https://github.com/mikefarah/yq).'
 
 function error() {
-    echo -e "\n$usage\n\nERROR:  $@." && exit 1
+    echo -e "\n$usage\n\nERROR:  $@." >&2 && exit 1
 }
 
 # Interpret command line:
 threads=2
 prefix=rec_
+java_quiet=false
+java_log_level=warning
 CLARA_USER_DATA=.
-while getopts y:o:p:c:t:n:lqmvh opt
+while getopts y:o:p:c:t:n:lL:qmvh opt
 do
     case $opt in
         y) yaml=$OPTARG ;;
@@ -37,8 +41,9 @@ do
         t) threads=$OPTARG && echo $threads | grep -q -E '^[0-9]+$' || error "-t must be an integer, threads" ;;
         n) nevents="-e $OPTARG" && echo "$nevents" | grep -q -E '^-e [0-9]+$' || error "-n must be an integer, events" ;;
         l) large=1 ;;
+        L) java_log_level=$OPTARG ;;
         m) merge=1 ;;
-        q) quiet=1 ;;
+        q) java_quiet=true ;;
         v) set -o xtrace ;;
         h) echo -e "\n$usage" && echo -e $info && exit 0 ;;
     esac
@@ -68,7 +73,7 @@ java_opts="-Xms${gb_init}g -Xmx${gb_max}g"
 yaml=$(cd $(dirname $yaml) && pwd)/$(basename $yaml)
 
 # Create the environment variables and directories required by CLARA:
-[ -e $CLARA_USER_DATA ] && echo "WARNING:  Using existing directory:  $CLARA_USER_DATA"
+[ -e $CLARA_USER_DATA ] && echo "WARNING:  Using existing directory:  $CLARA_USER_DATA" >&2
 mkdir -p $CLARA_USER_DATA || error "Cannot create -o output directory: $CLARA_USER_DATA"
 mkdir -p $CLARA_USER_DATA/log $CLARA_USER_DATA/config $CLARA_USER_DATA/data/output
 export CLARA_USER_DATA=$(cd $CLARA_USER_DATA && pwd)
@@ -90,11 +95,20 @@ done
 JAVA_OPTS="$java_opts $JAVA_OPTS -XX:+IgnoreUnrecognizedVMOptions"
 JAVA_OPTS="$JAVA_OPTS -Djava.io.tmpdir=$CLARA_USER_DATA -Dorg.sqlite.tmpdir=$CLARA_USER_DATA"
 
-# Set verbosity:
-[ -z ${quiet+x} ] && stub=logging || stub=debug
+# Set logger and verbosity
 JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.jlab.logging.SplitLogManager"
-JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.config.file=$CLAS12DIR/etc/logging/$stub.properties"
-
+if $java_quiet; then
+  JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.config.file=$CLAS12DIR/etc/logging/logging.properties"
+else
+  case ${java_log_level^^} in
+    SEVERE|WARNING|INFO|CONFIG|FINE|FINER|FINEST|ALL|OFF)
+      JAVA_OPTS="$JAVA_OPTS -D.level=${java_log_level^^}"
+      ;;
+    *)
+      error "unknown Java log level '$java_log_level'"
+      ;;
+  esac
+fi
 export JAVA_OPTS
 
 function get_host_ip() {