Skip to content

Commit d3efcf0

Browse files
authored
build(deps): bump coatjava and use new SplitLogManager (#432)
1 parent 0cd1cf9 commit d3efcf0

6 files changed

Lines changed: 11 additions & 91 deletions

File tree

data/logging/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

data/logging/debug.properties

Lines changed: 0 additions & 29 deletions
This file was deleted.

data/logging/logging.properties

Lines changed: 0 additions & 51 deletions
This file was deleted.

libexec/environ.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
printError() { echo -e "\e[1;31m[ERROR]: $* \e[0m" >&2; }
55
printWarning() { echo -e "\e[1;35m[WARNING]: $* \e[0m" >&2; }
66

7-
# enable/disable verbose logger
8-
log_config=logging # set to 'logging' for quiet, or to 'debug' for verbose
9-
107
# get the source code directory
118
[ -z "${BASH_SOURCE[0]}" ] && this_env=$0 || this_env=${BASH_SOURCE[0]}
129
export TIMELINESRC=$(realpath $(dirname $this_env)/..)
@@ -24,14 +21,22 @@ fi
2421
# java options
2522
timeline_java_opts=(
2623
-cp "$TIMELINESRC/target/*:$TIMELINESRC/target/dependency/*"
27-
-Djava.util.logging.config.file=$TIMELINESRC/data/logging/$log_config.properties
2824
-Xmx2048m
2925
-XX:+UseSerialGC
3026
-Djava.awt.headless=true
3127
)
28+
29+
# logger options
30+
timeline_java_opts+=(
31+
-Djava.util.logging.manager=org.jlab.logging.SplitLogManager
32+
-D.level=WARNING # global log level
33+
-Dorg.freehep.math.minuit.level=OFF
34+
-Dorg.jlab.io.hipo.level=OFF
35+
)
36+
37+
# export
3238
export TIMELINE_JAVA_OPTS="${timeline_java_opts[*]}"
3339

3440
# cleanup vars
3541
unset this_env
36-
unset log_config
3742
unset timeline_java_opts

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>org.jlab.coat</groupId>
3737
<artifactId>coat-libs</artifactId>
38-
<version>13.4.1</version>
38+
<version>13.5.1</version>
3939
<type>jar</type>
4040
</dependency>
4141
<!-- https://mvnrepository.com/artifact/org.apache.groovy/groovy-all -->

src/main/java/org/jlab/clas/timeline/run_histograms.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@
99
import org.jlab.io.base.DataEvent;
1010
import org.jlab.io.hipo.HipoDataSource;
1111
import org.jlab.groot.base.GStyle;
12-
import org.jlab.logging.DefaultLogger;
1312

1413
public class run_histograms {
1514
public run_histograms(){}
1615
////////////////////////////////////////////////
1716
public static void main(String[] args) {
1817
System.setProperty("java.awt.headless", "true");
1918
GStyle.setPalette("kRainBow");
20-
DefaultLogger.debug();
2119
int count = 0;
2220
int runNum = 0;
2321
String outputDir = "plots";

0 commit comments

Comments
 (0)