feat: SplitLogManager for treewide logging control

bin/bg-merger

@@ -6,7 +6,7 @@ export MALLOC_ARENA_MAX=1
 
 split_cli $@
 
-java -Xmx1536m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \
+java ${JAVA_OPTS-} -Xmx1536m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.eventmerger.EventMerger \
     ${class_options[@]}

bin/bos2hipo

@@ -2,7 +2,7 @@
 
 . `dirname $0`/../libexec/env.sh
 
-java -Xms1024m -XX:+UseSerialGC \
+java ${JAVA_OPTS-} -Xms1024m -XX:+UseSerialGC \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.io.utils.Bos2HipoEventBank \
     $*

bin/cvt-compare

@@ -4,7 +4,7 @@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx1536m -Xms1024m -XX:+UseSerialGC \
+java ${JAVA_OPTS-} -Xmx1536m -Xms1024m -XX:+UseSerialGC \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.rec.cvt.Geometry \
     $*

bin/daqEventViewer

@@ -2,7 +2,7 @@
 
 . `dirname $0`/../libexec/env.sh
 
-java -Xms1024m \
+java ${JAVA_OPTS-} -Xms1024m \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.detector.examples.RawEventViewer \
     $*

bin/dclayereffs-ana

@@ -2,7 +2,7 @@
 
 . `dirname $0`/../libexec/env.sh
 
-java -Dsun.java2d.pmoffscreen=false -Xmx2048m -Xms1024m \
+java ${JAVA_OPTS-} -Dsun.java2d.pmoffscreen=false -Xmx2048m -Xms1024m \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.service.dc.LayerEfficiencyAnalyzer \
     $*

bin/decoder

@@ -6,7 +6,7 @@ split_cli $@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx1536m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \
+java ${JAVA_OPTS-} -Xmx1536m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.detector.decode.CLASDecoder4 \
     ${class_options[@]}

bin/dict-generator

@@ -4,7 +4,7 @@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx1536m -Xms1024m -XX:+UseSerialGC \
+java ${JAVA_OPTS-} -Xmx1536m -Xms1024m -XX:+UseSerialGC \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.roads.DictionaryGenerator \
     $*

bin/dict-maker

@@ -4,7 +4,7 @@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx1536m -Xms1024m -XX:+UseSerialGC \
+java ${JAVA_OPTS-} -Xmx1536m -Xms1024m -XX:+UseSerialGC \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.roads.DictionaryCreator \
     $*

bin/dict-merger

@@ -4,7 +4,7 @@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx1536m -Xms1024m \
+java ${JAVA_OPTS-} -Xmx1536m -Xms1024m \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.roads.DictionaryMerger \
     $*

bin/dict-validator

@@ -4,7 +4,7 @@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx1536m -Xms1024m \
+java ${JAVA_OPTS-} -Xmx1536m -Xms1024m \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.roads.DictionaryValidator \
     $*

bin/evio-viewer

@@ -2,4 +2,4 @@
 
 . `dirname $0`/../libexec/env.sh
 
-java -cp ${COATJAVA_CLASSPATH:-''} org.jlab.coda.eventViewer.EventTreeFrame $*
+java ${JAVA_OPTS-} -cp ${COATJAVA_CLASSPATH:-''} org.jlab.coda.eventViewer.EventTreeFrame $*

bin/evio2hipo

@@ -4,7 +4,7 @@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx1536m -Xms1024m -XX:+UseSerialGC \
+java ${JAVA_OPTS-} -Xmx1536m -Xms1024m -XX:+UseSerialGC \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.clas.reco.io.EvioHipoEvent4 \
     $*

bin/eviocure

@@ -4,6 +4,6 @@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx1536m -Xms1024m \
+java ${JAVA_OPTS-} -Xmx1536m -Xms1024m \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.io.utils.EvioCure $*

bin/eviodump

@@ -2,7 +2,7 @@
 
 . `dirname $0`/../libexec/env.sh
 
-java -Xms1024m \
+java ${JAVA_OPTS-} -Xms1024m \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.io.utils.DataSourceDump \
     $*

bin/hipo-browser

@@ -2,7 +2,7 @@
 
 . `dirname $0`/../libexec/env.sh
 
-java -Xms1024m \
+java ${JAVA_OPTS-} -Xms1024m \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.groot.ui.TBrowser \
     $*

bin/hipo-diff

@@ -4,7 +4,7 @@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx1536m -Xms1024m -XX:+UseSerialGC \
+java ${JAVA_OPTS-} -Xmx1536m -Xms1024m -XX:+UseSerialGC \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.utils.HipoDiff \
     $*

bin/hipo-json

@@ -2,7 +2,7 @@
 
 . `dirname $0`/../libexec/env.sh
 
-java -Xms1024m \
+java ${JAVA_OPTS-} -Xms1024m \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.utils.JsonUtils \
     $*

bin/hipo-merge-histograms

@@ -4,7 +4,7 @@
 
 split_cli $@
 
-cmd="java -Xms1024m ${jvm_options[@]} -cp ${COATJAVA_CLASSPATH:-''} org.jlab.groot.data.TDirectory"
+cmd="java ${JAVA_OPTS-} -Xms1024m ${jvm_options[@]} -cp ${COATJAVA_CLASSPATH:-''} org.jlab.groot.data.TDirectory"
 
 if [ $# -eq 0 ]; then
   echo """

bin/hipo-utils

@@ -6,7 +6,7 @@ split_cli $@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx2048m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \
+java ${JAVA_OPTS-} -Xmx2048m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.io.hipo.HipoUtilities \
     ${class_options[@]}

bin/postprocess

@@ -4,7 +4,7 @@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx768m -Xms768m -XX:+UseSerialGC \
+java ${JAVA_OPTS-} -Xmx768m -Xms768m -XX:+UseSerialGC \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.postprocess.Tag1ToEvent \
     $*

bin/rebuild-scalers

@@ -6,7 +6,7 @@ split_cli $@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xms768m -Xmx1536m -XX:+UseSerialGC ${jvm_options[@]} \
+java ${JAVA_OPTS-} -Xms768m -Xmx1536m -XX:+UseSerialGC ${jvm_options[@]} \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.postprocess.RebuildScalers \
     ${class_options[@]}

bin/recon-util

@@ -6,7 +6,7 @@ split_cli $@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx1536m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \
+java ${JAVA_OPTS-} -Xmx1536m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.clas.reco.EngineProcessor \
     ${class_options[@]}

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=info
 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,10 +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=fine || stub=info
-JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.config.file=$CLAS12DIR/etc/logging/$stub.properties"
-
+# Set logger and verbosity
+JAVA_OPTS="$JAVA_OPTS -Djava.util.logging.manager=org.jlab.logging.SplitLogManager"
+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() {

bin/run-coatjava

@@ -24,7 +24,7 @@ shift
 
 split_cli $@
 
-exec java -Xmx1536m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \
+exec java ${JAVA_OPTS-} -Xmx1536m -Xms1024m -XX:+UseSerialGC ${jvm_options[@]} \
   -cp ${COATJAVA_CLASSPATH:-''} \
   $class_name \
   ${class_options[@]}

bin/trigger-filter

@@ -4,7 +4,7 @@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx1536m -Xms1024m -XX:+UseSerialGC \
+java ${JAVA_OPTS-} -Xmx1536m -Xms1024m -XX:+UseSerialGC \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.eventmerger.RandomTriggerFilter \
     $*

bin/trigger-splitter

@@ -4,7 +4,7 @@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx1536m -Xms1024m -XX:+UseSerialGC \
+java ${JAVA_OPTS-} -Xmx1536m -Xms1024m -XX:+UseSerialGC \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.eventmerger.RandomTriggerSplit \
     $*

bin/trutheff

@@ -4,7 +4,7 @@
 
 export MALLOC_ARENA_MAX=1
 
-java -Xmx1536m -Xms1024m -XX:+UseSerialGC \
+java ${JAVA_OPTS-} -Xmx1536m -Xms1024m -XX:+UseSerialGC \
     -cp ${COATJAVA_CLASSPATH:-''} \
     org.jlab.analysis.efficiency.Truth \
     $*

common-tools/clas-analysis/pom.xml

@@ -77,12 +77,6 @@
       <version>13.5.0-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.jlab.clas</groupId>
-      <artifactId>clas-logging</artifactId>
-      <version>13.5.0-SNAPSHOT</version>
-    </dependency>
-
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>swim-tools</artifactId>

common-tools/clas-analysis/src/main/java/org/jlab/analysis/postprocess/Tag1ToEvent.java

@@ -13,7 +13,6 @@
 import org.jlab.detector.helicity.HelicityBit;
 import org.jlab.detector.helicity.HelicitySequenceDelayed;
 import org.jlab.jnp.hipo4.data.SchemaFactory;
-import org.jlab.logging.SplitLogger;
 import org.jlab.utils.groups.IndexedTable;
 import org.jlab.utils.options.OptionParser;
 
@@ -31,7 +30,7 @@
 
 public class Tag1ToEvent {
 
-    static final Logger LOGGER = SplitLogger.create(Tag1ToEvent.class.getName());
+    static final Logger LOGGER = Logger.getLogger(Tag1ToEvent.class.getName());
 
     public static void main(String[] args) {
 

common-tools/clas-analysis/src/main/java/org/jlab/analysis/postprocess/Util.java

@@ -22,15 +22,13 @@
 import org.jlab.detector.helicity.HelicitySequenceDelayed;
 import org.jlab.detector.helicity.HelicitySequenceManager;
 
-import org.jlab.logging.SplitLogger;
-
 /**
  * Static utility methods for postprocessing.
  * @author baltzell
  */
 class Util {
 
-    static final Logger logger = SplitLogger.create(Util.class.getName());
+    static final Logger logger = Logger.getLogger(Util.class.getName());
 
     /**
      * Assign the delay-corrected helicity to the HEL::scaler bank's rows

common-tools/clas-detector/src/main/java/org/jlab/detector/calib/utils/ConstantsManager.java

@@ -13,7 +13,7 @@
 import java.util.logging.Logger;
 
 import org.jlab.utils.groups.IndexedTable;
-import org.jlab.logging.SplitLogger;
+import org.jlab.logging.SplitLogManager;
 
 /**
  *
@@ -23,7 +23,10 @@ public class ConstantsManager {
 
     public static final int DBERROR_SLEEP_SECONDS=3;
 
-    private static Logger LOGGER = SplitLogger.create(ConstantsManager.class.getName(), false);
+    private static Logger LOGGER = Logger.getLogger(ConstantsManager.class.getName());
+    static {
+        SplitLogManager.configureHandlers(LOGGER, false);
+    }
 
     private DatabaseConstantsDescriptor defaultDescriptor = new DatabaseConstantsDescriptor();
     private volatile Map<Integer, DatabaseConstantsDescriptor> runConstants = new LinkedHashMap<Integer, DatabaseConstantsDescriptor>();
@@ -182,7 +185,10 @@ public String toString() {
      */
     public static class DatabaseConstantsDescriptor {
 
-        Logger LOGGER = SplitLogger.create(DatabaseConstantsDescriptor.class.getName(), false);
+        private static Logger LOGGER = Logger.getLogger(DatabaseConstantsDescriptor.class.getName());
+        static {
+          SplitLogManager.configureHandlers(LOGGER, false);
+        }
 
         private String  descName   = "descriptor";
         private int     runNumber  = 10;