Skip to content

Use Log4J consistently #974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-jeckels merged 1 commit into from
Jan 24, 2025
Merged

Use Log4J consistently #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions server/embedded/src/org/labkey/embedded/EmbeddedExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.labkey.embedded;

import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.labkey.bootstrap.ConfigException;

import java.io.BufferedOutputStream;
Expand All @@ -22,7 +22,7 @@

public class EmbeddedExtractor
{
private static final Log LOG = LogFactory.getLog(EmbeddedExtractor.class);
private static final Logger LOG = LogManager.getLogger(EmbeddedExtractor.class);
private static final int BUFFER_SIZE = 1024 * 64;
public static final String LABKEYWEBAPP = "labkeywebapp";
/**
Expand Down
6 changes: 3 additions & 3 deletions server/embedded/src/org/labkey/embedded/LabKeyTomcatServletWebServerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
import org.apache.catalina.loader.WebappLoader;
import org.apache.catalina.startup.Tomcat;
import org.apache.catalina.valves.JsonAccessLogValve;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.coyote.http11.AbstractHttp11Protocol;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.tomcat.util.descriptor.web.ContextResource;
import org.labkey.bootstrap.ConfigException;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
Expand All @@ -27,7 +27,7 @@

class LabKeyTomcatServletWebServerFactory extends TomcatServletWebServerFactory
{
private static final Log LOG = LogFactory.getLog(LabKeyTomcatServletWebServerFactory.class);
private static final Logger LOG = LogManager.getLogger(LabKeyTomcatServletWebServerFactory.class);
private final LabKeyServer _server;

public LabKeyTomcatServletWebServerFactory(LabKeyServer server)
Expand Down
Loading