Skip to content
This repository was archived by the owner on Feb 18, 2021. It is now read-only.

Item 7490: upgrade log4j #108

Merged
labkey-ankurj merged 1 commit into from
Aug 5, 2020
Merged

Item 7490: upgrade log4j #108

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
7 changes: 4 additions & 3 deletions src/org/labkey/mobileappstudy/DynamicListProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.labkey.mobileappstudy;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.labkey.api.data.Container;
import org.labkey.api.data.JdbcType;
import org.labkey.api.data.PropertyStorageSpec;
Expand All @@ -19,12 +20,12 @@ public abstract class DynamicListProcessor

public DynamicListProcessor()
{
this(Logger.getLogger(MobileAppStudy.class));
this(LogManager.getLogger(MobileAppStudy.class));
}

public DynamicListProcessor(Logger logger)
{
this.logger = logger != null ? logger : Logger.getLogger(MobileAppStudy.class);
this.logger = logger != null ? logger : LogManager.getLogger(MobileAppStudy.class);
}

/**
Expand Down
5 changes: 3 additions & 2 deletions src/org/labkey/mobileappstudy/MobileAppStudyController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.JsonNode;
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.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.action.Action;
Expand Down Expand Up @@ -90,7 +91,7 @@
@Marshal(Marshaller.Jackson)
public class MobileAppStudyController extends SpringActionController
{
private static final Logger LOG = Logger.getLogger(MobileAppStudyController.class);
private static final Logger LOG = LogManager.getLogger(MobileAppStudyController.class);
private static final DefaultActionResolver _actionResolver = new DefaultActionResolver(MobileAppStudyController.class);

public static final String NAME = "mobileappstudy";
Expand Down
5 changes: 3 additions & 2 deletions src/org/labkey/mobileappstudy/MobileAppStudyManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

import org.apache.commons.lang3.RandomStringUtils;
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.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.collections.ArrayListMap;
Expand Down Expand Up @@ -104,7 +105,7 @@ public class MobileAppStudyManager

private static final int THREAD_COUNT = 10;
private static JobRunner _shredder;
private static final Logger logger = Logger.getLogger(MobileAppStudy.class);
private static final Logger logger = LogManager.getLogger(MobileAppStudy.class);

public static final String OTHER_OPTION_TITLE = "_Other_Text";

Expand Down
3 changes: 2 additions & 1 deletion src/org/labkey/mobileappstudy/SurveyDesignProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
package org.labkey.mobileappstudy;

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.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.data.Container;
Expand Down
3 changes: 2 additions & 1 deletion src/org/labkey/mobileappstudy/forwarder/BasicAuthForwarder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.labkey.mobileappstudy.forwarder;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.labkey.api.data.Container;
import org.labkey.api.pipeline.PipelineJob;
import org.labkey.api.security.User;
Expand Down
5 changes: 3 additions & 2 deletions src/org/labkey/mobileappstudy/forwarder/Forwarder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.labkey.mobileappstudy.forwarder;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.labkey.api.data.Container;
import org.labkey.api.pipeline.PipelineJob;
import org.labkey.api.security.User;
Expand All @@ -21,7 +22,7 @@ public abstract class Forwarder

public Forwarder(Container container, Logger logger)
{
this.logger = logger != null ? logger : Logger.getLogger(Forwarder.class.getName());
this.logger = logger != null ? logger : LogManager.getLogger(Forwarder.class.getName());
this.container = container;
this.properties = Collections.unmodifiableMap(new ForwarderProperties().getForwarderConnection(container));
}
Expand Down
5 changes: 3 additions & 2 deletions src/org/labkey/mobileappstudy/forwarder/ForwardingScheduler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*/
package org.labkey.mobileappstudy.forwarder;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.labkey.api.collections.ConcurrentHashSet;
import org.labkey.api.data.Container;
import org.labkey.api.data.ContainerManager;
Expand All @@ -39,7 +40,7 @@
public class ForwardingScheduler
{
private static JobDetail job = null;
private static final Logger logger = Logger.getLogger(ForwardingScheduler.class);
private static final Logger logger = LogManager.getLogger(ForwardingScheduler.class);
private static final int INTERVAL_MINUTES = 5;
private static final ForwardingScheduler instance = new ForwardingScheduler();
private static Set<String> enabledContainers = new ConcurrentHashSet<>();
Expand Down
3 changes: 2 additions & 1 deletion src/org/labkey/mobileappstudy/forwarder/ForwardingType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.labkey.mobileappstudy.forwarder;

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.Container;
import org.labkey.api.util.EnumHasHtmlString;
import org.labkey.mobileappstudy.MobileAppStudyController;
Expand Down
5 changes: 3 additions & 2 deletions src/org/labkey/mobileappstudy/forwarder/OAuthForwarder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.auth.AuthenticationException;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.cache.Cache;
Expand All @@ -28,7 +29,7 @@ public class OAuthForwarder extends Forwarder
private static final int MAX_RETRIES = 1;
private static final Cache<Container, String> authTokenCache =
CacheManager.getBlockingCache(100, TimeUnit.HOURS.toMillis(1), "Mobile app forwarding tokens",
(key, args) -> requestNewAuthToken(key, Logger.getLogger(OAuthForwarder.class)));
(key, args) -> requestNewAuthToken(key, LogManager.getLogger(OAuthForwarder.class)));

public OAuthForwarder(Container container, Logger logger)
{
Expand Down
5 changes: 3 additions & 2 deletions src/org/labkey/mobileappstudy/forwarder/SurveyResponseForwardingJob.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
package org.labkey.mobileappstudy.forwarder;

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.Container;
import org.labkey.api.data.ContainerManager;
import org.labkey.api.pipeline.PipeRoot;
Expand All @@ -41,7 +42,7 @@

public class SurveyResponseForwardingJob implements org.quartz.Job, Callable<String>
{
private static final Logger logger = Logger.getLogger(SurveyResponseForwardingJob.class);
private static final Logger logger = LogManager.getLogger(SurveyResponseForwardingJob.class);
private static volatile Set<String> unsuccessful = new HashSet<>();

// Private service user
Expand Down
3 changes: 2 additions & 1 deletion src/org/labkey/mobileappstudy/participantproperties/ParticipantPropertiesProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.labkey.mobileappstudy.participantproperties;

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.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.data.Container;
Expand Down
3 changes: 2 additions & 1 deletion src/org/labkey/mobileappstudy/surveydesign/AbstractSurveyDesignProviderImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.labkey.api.data.Container;
import org.labkey.mobileappstudy.data.ActivityMetadataResponse;
import org.labkey.mobileappstudy.participantproperties.ParticipantPropertiesDesign;
Expand Down
3 changes: 2 additions & 1 deletion src/org/labkey/mobileappstudy/surveydesign/FileSurveyDesignProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
*/
package org.labkey.mobileappstudy.surveydesign;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.labkey.api.data.Container;
import org.labkey.api.module.Module;
import org.labkey.api.module.ModuleLoader;
Expand Down
3 changes: 2 additions & 1 deletion src/org/labkey/mobileappstudy/surveydesign/ServiceSurveyDesignProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
import org.apache.http.impl.client.BasicResponseHandler;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.labkey.api.data.Container;
import org.labkey.api.module.Module;
import org.labkey.api.module.ModuleLoader;
Expand Down