From 486fe470cf11b2f5658d30abdd1b38cea85d3103 Mon Sep 17 00:00:00 2001 From: labkey-ankurj Date: Tue, 7 Jul 2020 13:36:53 -0700 Subject: [PATCH 1/4] Item 7490: Migration from log4j1 to log4j2 - update java methods and package names --- .../src/org/labkey/dumbster/model/DumbsterManager.java | 5 +++-- .../labkey/linkedschematest/TestLinkedSchemaCustomizer.java | 5 +++-- .../src/org/labkey/linkedschematest/TestTableCustomizer.java | 5 +++-- src/org/labkey/test/WebDriverWrapper.java | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/dumbster/src/org/labkey/dumbster/model/DumbsterManager.java b/modules/dumbster/src/org/labkey/dumbster/model/DumbsterManager.java index b1a4d84ae7..d981349e3a 100644 --- a/modules/dumbster/src/org/labkey/dumbster/model/DumbsterManager.java +++ b/modules/dumbster/src/org/labkey/dumbster/model/DumbsterManager.java @@ -17,7 +17,8 @@ import com.dumbster.smtp.SimpleSmtpServer; import com.dumbster.smtp.SmtpMessage; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.labkey.api.settings.AppProps; import org.labkey.api.util.ContextListener; import org.labkey.api.util.MailHelper; @@ -41,7 +42,7 @@ */ public class DumbsterManager implements ShutdownListener { - private static final Logger _log = Logger.getLogger(DumbsterManager.class); + private static final Logger _log = LogManager.getLogger(DumbsterManager.class); private static DumbsterManager instance; diff --git a/modules/linkedschematest/src/org/labkey/linkedschematest/TestLinkedSchemaCustomizer.java b/modules/linkedschematest/src/org/labkey/linkedschematest/TestLinkedSchemaCustomizer.java index 91126ecd7a..54567ede1f 100644 --- a/modules/linkedschematest/src/org/labkey/linkedschematest/TestLinkedSchemaCustomizer.java +++ b/modules/linkedschematest/src/org/labkey/linkedschematest/TestLinkedSchemaCustomizer.java @@ -15,7 +15,8 @@ */ package org.labkey.linkedschematest; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.xmlbeans.SimpleValue; import org.apache.xmlbeans.XmlObject; import org.jetbrains.annotations.Nullable; @@ -41,7 +42,7 @@ */ public class TestLinkedSchemaCustomizer implements LinkedSchemaCustomizer { - private static Logger LOG = Logger.getLogger(TestLinkedSchemaCustomizer.class); + private static Logger LOG = LogManager.getLogger(TestLinkedSchemaCustomizer.class); // Name of the parameter declaration private static final String PARAM_FAMILY = "PARAM_FAMILY"; diff --git a/modules/linkedschematest/src/org/labkey/linkedschematest/TestTableCustomizer.java b/modules/linkedschematest/src/org/labkey/linkedschematest/TestTableCustomizer.java index 07b509a760..a59e997d5b 100644 --- a/modules/linkedschematest/src/org/labkey/linkedschematest/TestTableCustomizer.java +++ b/modules/linkedschematest/src/org/labkey/linkedschematest/TestTableCustomizer.java @@ -17,7 +17,8 @@ import org.apache.commons.collections4.MultiValuedMap; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.labkey.api.data.TableCustomizer; import org.labkey.api.data.TableInfo; @@ -26,7 +27,7 @@ public class TestTableCustomizer implements TableCustomizer { - private static final Logger _log = Logger.getLogger(TestTableCustomizer.class); + private static final Logger _log = LogManager.getLogger(TestTableCustomizer.class); public TestTableCustomizer() { diff --git a/src/org/labkey/test/WebDriverWrapper.java b/src/org/labkey/test/WebDriverWrapper.java index 427a6c08ba..45bd058cb2 100644 --- a/src/org/labkey/test/WebDriverWrapper.java +++ b/src/org/labkey/test/WebDriverWrapper.java @@ -164,7 +164,7 @@ public abstract class WebDriverWrapper implements WrapsDriver { // Eliminate noise from org.openqa.selenium.remote.ProtocolHandshake and org.openqa.selenium.interactions.Actions if (!isWebDriverLoggingEnabled()) - Logger.getLogger("org.openqa.selenium").setLevel(Level.WARNING); + LogManager.getLogger("org.openqa.selenium").setLevel(Level.WARNING); } public WebDriverWrapper() From f46c7ab5503b23bdaf454fc60236e5a9ea66f42e Mon Sep 17 00:00:00 2001 From: labkey-ankurj Date: Wed, 15 Jul 2020 14:10:10 -0700 Subject: [PATCH 2/4] put back java logging reference --- src/org/labkey/test/WebDriverWrapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/WebDriverWrapper.java b/src/org/labkey/test/WebDriverWrapper.java index 45bd058cb2..427a6c08ba 100644 --- a/src/org/labkey/test/WebDriverWrapper.java +++ b/src/org/labkey/test/WebDriverWrapper.java @@ -164,7 +164,7 @@ public abstract class WebDriverWrapper implements WrapsDriver { // Eliminate noise from org.openqa.selenium.remote.ProtocolHandshake and org.openqa.selenium.interactions.Actions if (!isWebDriverLoggingEnabled()) - LogManager.getLogger("org.openqa.selenium").setLevel(Level.WARNING); + Logger.getLogger("org.openqa.selenium").setLevel(Level.WARNING); } public WebDriverWrapper() From 2ed60466d2519abee224c844e13116fb11d6979d Mon Sep 17 00:00:00 2001 From: labkey-ankurj Date: Fri, 31 Jul 2020 14:15:25 -0700 Subject: [PATCH 3/4] enabling heap dump for checking memory leaks --- src/org/labkey/test/TestProperties.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/test/TestProperties.java b/src/org/labkey/test/TestProperties.java index 46bba7e6a3..06d98beabe 100644 --- a/src/org/labkey/test/TestProperties.java +++ b/src/org/labkey/test/TestProperties.java @@ -126,7 +126,8 @@ public static boolean isSystemMaintenanceDisabled() public static boolean isHeapDumpCollectionEnabled() { - return "true".equals(System.getProperty("enable.heap.dump")); + // TODO log4j : change before merge + return true; } public static boolean isRunWebDriverHeadless() From 4e8d3e98ac2b60fd84c6de690998b90200f4edc5 Mon Sep 17 00:00:00 2001 From: labkey-ankurj Date: Wed, 5 Aug 2020 11:28:48 -0700 Subject: [PATCH 4/4] update log4j2versions --- src/org/labkey/test/TestProperties.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/org/labkey/test/TestProperties.java b/src/org/labkey/test/TestProperties.java index 06d98beabe..46bba7e6a3 100644 --- a/src/org/labkey/test/TestProperties.java +++ b/src/org/labkey/test/TestProperties.java @@ -126,8 +126,7 @@ public static boolean isSystemMaintenanceDisabled() public static boolean isHeapDumpCollectionEnabled() { - // TODO log4j : change before merge - return true; + return "true".equals(System.getProperty("enable.heap.dump")); } public static boolean isRunWebDriverHeadless()