Skip to content

Item 7490: upgrade log4j #40

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-ankurj merged 1 commit into from
Aug 5, 2020
Merged

Item 7490: upgrade log4j #40

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
3 changes: 2 additions & 1 deletion hdrl/src/org/labkey/hdrl/HDRLMaintenanceTask.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.hdrl;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.labkey.api.data.DbSchema;
import org.labkey.api.data.DbScope;
import org.labkey.api.data.SQLFragment;
Expand Down
5 changes: 3 additions & 2 deletions hdrl/src/org/labkey/hdrl/HDRLManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
package org.labkey.hdrl;

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.attachments.InputStreamAttachmentFile;
import org.labkey.api.data.CompareType;
import org.labkey.api.data.Container;
Expand Down Expand Up @@ -45,7 +46,7 @@

public class HDRLManager
{
private static final Logger LOG = Logger.getLogger(HDRLManager.class);
private static final Logger LOG = LogManager.getLogger(HDRLManager.class);
private static final String HDRL_SENSITIVE_DATA_TIME_WINDOW = "hdrlSensitiveDataDeletionTimeWindow";
private static final String NUM_OF_DAYS_KEY = "HDRLSensitiveDataDeletionWindow";
private static final int DEFAULT_NUM_OF_DAYS = 30; //default number of days after which data will be deleted
Expand Down
5 changes: 3 additions & 2 deletions hdrl/src/org/labkey/hdrl/HDRLModule.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.hdrl;

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 All @@ -37,7 +38,7 @@

public class HDRLModule extends DefaultModule
{
private static final Logger _log = Logger.getLogger(HDRLModule.class);
private static final Logger _log = LogManager.getLogger(HDRLModule.class);
public static final String NAME = "HDRL";

@Override
Expand Down
3 changes: 2 additions & 1 deletion ms2extensions/src/org/labkey/ms2extensions/PeptideCountPepXmlDataHandler.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.ms2extensions;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.jetbrains.annotations.Nullable;
import org.labkey.api.data.Container;
import org.labkey.api.exp.ExperimentDataHandler;
Expand Down
5 changes: 3 additions & 2 deletions ms2extensions/src/org/labkey/ms2extensions/PeptideCountUpdater.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.ms2extensions;

import org.apache.log4j.Logger;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.LogManager;
import org.labkey.api.collections.CaseInsensitiveHashMap;
import org.labkey.api.data.ColumnInfo;
import org.labkey.api.data.Container;
Expand Down Expand Up @@ -50,7 +51,7 @@ public class PeptideCountUpdater
{
private static final Lock LOCK = new ReentrantLock();

private static final Logger LOG = Logger.getLogger(PeptideCountUpdater.class);
private static final Logger LOG = LogManager.getLogger(PeptideCountUpdater.class);

/** @return error message with any problems encountered during the update */
public String update(Container container, User user)
Expand Down