From 46bdac44ec25fca2bb447a42bd62f7e3d54e40d3 Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Fri, 17 Nov 2023 15:31:03 +0000 Subject: [PATCH 1/3] adjust java logging to INFO level only --- .../src/main/java/org/smi/common/logging/SmiLogging.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/common/com.smi.microservices.common/src/main/java/org/smi/common/logging/SmiLogging.java b/src/common/com.smi.microservices.common/src/main/java/org/smi/common/logging/SmiLogging.java index 632b7a2da..6f33f7276 100644 --- a/src/common/com.smi.microservices.common/src/main/java/org/smi/common/logging/SmiLogging.java +++ b/src/common/com.smi.microservices.common/src/main/java/org/smi/common/logging/SmiLogging.java @@ -100,18 +100,15 @@ public static void Setup(boolean testing) throws SmiLoggingException, IOExceptio logdir.mkdirs(); } - // Turn off log4j warnings from library code Logger l = Logger.getRootLogger(); - //l.setLevel(Level.OFF); + l.setLevel(testing ? Level.ALL : Level.INFO); - PatternLayout pl = new PatternLayout("%d{HH:mm:ss.SSS}|%t|%-5p|%-15C{1}| %m%n"); + PatternLayout pl = new PatternLayout("%d{HH:mm:ss.SSS}|%t|%-5p|%-15C| %m%n"); ConsoleAppender ca = new ConsoleAppender(); - ca.setThreshold(testing?Level.ALL:Level.ERROR); l.addAppender(ca); WriterAppender fa = new WriterAppender(pl,new FileWriter(logfile.getAbsolutePath(),true)); - fa.setThreshold(Level.ALL); fa.setImmediateFlush(true); fa.setLayout(pl); fa.activateOptions(); From fe0424a50728248039bfe4b2c05031cd1e4c6c01 Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Mon, 20 Nov 2023 14:18:19 +0000 Subject: [PATCH 2/3] selectively disable library debug logging --- .../main/java/org/smi/common/logging/SmiLogging.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/common/com.smi.microservices.common/src/main/java/org/smi/common/logging/SmiLogging.java b/src/common/com.smi.microservices.common/src/main/java/org/smi/common/logging/SmiLogging.java index 6f33f7276..3f1b9596f 100644 --- a/src/common/com.smi.microservices.common/src/main/java/org/smi/common/logging/SmiLogging.java +++ b/src/common/com.smi.microservices.common/src/main/java/org/smi/common/logging/SmiLogging.java @@ -12,12 +12,15 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.Properties; import java.util.Random; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.Level; +import org.apache.log4j.LogManager; import org.apache.log4j.Logger; import org.apache.log4j.PatternLayout; +import org.apache.log4j.PropertyConfigurator; import org.apache.log4j.WriterAppender; /** @@ -100,8 +103,13 @@ public static void Setup(boolean testing) throws SmiLoggingException, IOExceptio logdir.mkdirs(); } + Properties props = new Properties(); + props.put("log4j.logger.org.dcm4cheri", "INFO"); + props.put("log4j.logger.org.rsna", "INFO"); + PropertyConfigurator.configure(props); + Logger l = Logger.getRootLogger(); - l.setLevel(testing ? Level.ALL : Level.INFO); + l.setLevel(testing ? Level.ALL : Level.DEBUG); PatternLayout pl = new PatternLayout("%d{HH:mm:ss.SSS}|%t|%-5p|%-15C| %m%n"); From daef91a9687b40870903fc18e01dae642b99519f Mon Sep 17 00:00:00 2001 From: Ruairidh MacLeod Date: Mon, 20 Nov 2023 14:22:29 +0000 Subject: [PATCH 3/3] add news file --- news/1671-bugfix.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 news/1671-bugfix.md diff --git a/news/1671-bugfix.md b/news/1671-bugfix.md new file mode 100644 index 000000000..817611f9e --- /dev/null +++ b/news/1671-bugfix.md @@ -0,0 +1 @@ +disable debug logging spam from external CTP libraries