Upgrade Log4j to 2.16. (#1080)

cuebot/build.gradle

@@ -55,8 +55,9 @@ dependencies {
     compile group: 'org.quartz-scheduler', name: 'quartz', version: '2.2.1', { exclude group: 'c3p0', module: 'c3p0' }
     compile group: 'org.postgresql', name: 'postgresql', version: '42.2.2'
     compile group: 'com.google.protobuf', name: 'protobuf-java', version: '3.21.2'
-    compile group: 'log4j', name: 'log4j', version: '1.2.17'
-    compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.26'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.16.0'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.16.0'
+    compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.16.0'
 
     protobuf fileTree("../proto/")
 

cuebot/src/main/java/com/imageworks/common/spring/remoting/CueServerInterceptor.java

@@ -7,13 +7,14 @@
 import io.grpc.ServerCallHandler;
 import io.grpc.ServerInterceptor;
 import io.grpc.Status;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 
 public class CueServerInterceptor implements ServerInterceptor {
 
-    private static final Logger logger = Logger.getLogger(CueServerInterceptor.class);
-    private static final Logger accessLogger = Logger.getLogger("API");
+    private static final Logger logger = LogManager.getLogger(CueServerInterceptor.class);
+    private static final Logger accessLogger = LogManager.getLogger("API");
 
     @Override
     public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(

cuebot/src/main/java/com/imageworks/common/spring/remoting/GrpcServer.java

@@ -6,7 +6,8 @@
 
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -40,7 +41,7 @@
 
 public class GrpcServer implements ApplicationContextAware {
 
-    private static final Logger logger = Logger.getLogger(GrpcServer.class);
+    private static final Logger logger = LogManager.getLogger(GrpcServer.class);
 
     private static final String DEFAULT_NAME = "CueGrpcServer";
     private static final String DEFAULT_PORT = "8443";

cuebot/src/main/java/com/imageworks/spcue/CuebotApplication.java

@@ -23,7 +23,8 @@
 import java.util.stream.Stream;
 
 import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
@@ -34,7 +35,7 @@ private static String[] checkArgs(String[] args) {
                 .filter(arg -> arg.startsWith("--log.frame-log-root=")).findFirst();
         if (deprecatedFlag.isPresent()) {
             // Log a deprecation warning.
-            Logger warning_logger = Logger.getLogger(CuebotApplication.class);
+            Logger warning_logger = LogManager.getLogger(CuebotApplication.class);
             warning_logger.warn("`--log.frame-log-root` is deprecated and will be removed in an " +
                     "upcoming release. It has been replaced with `--log.frame-log-root.default_os`. " +
                     "See opencue.properties for details on OpenCue's new OS-dependent root directories.");

cuebot/src/main/java/com/imageworks/spcue/SortableShow.java

@@ -24,11 +24,12 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 public class SortableShow implements Comparable<SortableShow> {
 
-    private static final Logger logger = Logger.getLogger(SortableShow.class);
+    private static final Logger logger = LogManager.getLogger(SortableShow.class);
 
     private String show;
     private float tier;

cuebot/src/main/java/com/imageworks/spcue/dao/criteria/postgres/FrameSearch.java

@@ -23,7 +23,8 @@
 import java.util.stream.Collectors;
 
 import com.google.common.collect.ImmutableList;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import com.imageworks.spcue.FrameInterface;
 import com.imageworks.spcue.JobInterface;
@@ -36,7 +37,7 @@
 
 public class FrameSearch extends Criteria implements FrameSearchInterface {
     private static final int MAX_RESULTS = 1000;
-    private static final Logger logger = Logger.getLogger(FrameSearch.class);
+    private static final Logger logger = LogManager.getLogger(FrameSearch.class);
     private static final Pattern PATTERN_SINGLE_FRAME = Pattern.compile("^([0-9]+)$");
     private static final Pattern PATTERN_RANGE = Pattern.compile("^([0-9]+)\\-([0-9]+)$");
     private static final Pattern PATTERN_FLOAT_RANGE = Pattern.compile("^([0-9\\.]+)\\-([0-9\\.]+)$");

cuebot/src/main/java/com/imageworks/spcue/dao/postgres/DispatcherDaoJdbc.java

@@ -28,7 +28,8 @@
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.jdbc.core.RowMapper;
@@ -58,7 +59,7 @@
  */
 public class DispatcherDaoJdbc extends JdbcDaoSupport implements DispatcherDao {
 
-    private static final Logger logger = Logger.getLogger(DispatcherDaoJdbc.class);
+    private static final Logger logger = LogManager.getLogger(DispatcherDaoJdbc.class);
 
     public static final RowMapper<String> PKJOB_MAPPER =
         new RowMapper<String>() {

cuebot/src/main/java/com/imageworks/spcue/dao/postgres/ProcDaoJdbc.java

@@ -29,8 +29,6 @@
 import java.util.List;
 import java.util.Map;
 
-import com.imageworks.spcue.dispatcher.AbstractDispatcher;
-import org.apache.log4j.Logger;
 import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;

cuebot/src/main/java/com/imageworks/spcue/dao/postgres/WhiteboardDaoJdbc.java

@@ -29,7 +29,8 @@
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import com.google.protobuf.ByteString;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
 
@@ -129,7 +130,7 @@
 
 public class WhiteboardDaoJdbc extends JdbcDaoSupport implements WhiteboardDao {
     @SuppressWarnings("unused")
-    private static final Logger logger = Logger.getLogger(WhiteboardDaoJdbc.class);
+    private static final Logger logger = LogManager.getLogger(WhiteboardDaoJdbc.class);
 
     private FrameSearchFactory frameSearchFactory;
     private ProcSearchFactory procSearchFactory;

cuebot/src/main/java/com/imageworks/spcue/dispatcher/AbstractDispatcher.java

@@ -19,7 +19,8 @@
 
 package com.imageworks.spcue.dispatcher;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import com.imageworks.spcue.DispatchFrame;
 import com.imageworks.spcue.VirtualProc;
@@ -33,7 +34,7 @@
  */
 public abstract class AbstractDispatcher {
 
-    private static final Logger logger = Logger.getLogger(AbstractDispatcher.class);
+    private static final Logger logger = LogManager.getLogger(AbstractDispatcher.class);
 
     public DispatchSupport dispatchSupport;
     public RqdClient rqdClient;

cuebot/src/main/java/com/imageworks/spcue/dispatcher/BookingQueue.java

@@ -23,7 +23,8 @@
 import com.google.common.cache.CacheBuilder;
 import com.imageworks.spcue.dispatcher.commands.KeyRunnable;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 
@@ -36,7 +37,7 @@ public class BookingQueue {
     private final int maxPoolSize;
     private static final int BASE_SLEEP_TIME_MILLIS = 300;
 
-    private static final Logger logger = Logger.getLogger("HEALTH");
+    private static final Logger logger = LogManager.getLogger("HEALTH");
     private HealthyThreadPool healthyThreadPool;
 
     public BookingQueue(int healthThreshold, int minUnhealthyPeriodMin, int queueCapacity,

cuebot/src/main/java/com/imageworks/spcue/dispatcher/CoreUnitDispatcher.java

@@ -25,7 +25,8 @@
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 
@@ -85,7 +86,7 @@
  */
 public class CoreUnitDispatcher implements Dispatcher {
     private static final Logger logger =
-        Logger.getLogger(CoreUnitDispatcher.class);
+        LogManager.getLogger(CoreUnitDispatcher.class);
 
     private DispatchSupport dispatchSupport;
 

cuebot/src/main/java/com/imageworks/spcue/dispatcher/DispatchQueue.java

@@ -22,7 +22,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import com.imageworks.spcue.dispatcher.commands.KeyRunnable;
 
 public class DispatchQueue {
@@ -33,7 +34,7 @@ public class DispatchQueue {
     private int corePoolSize;
     private int maxPoolSize;
 
-    private static final Logger logger = Logger.getLogger("HEALTH");
+    private static final Logger logger = LogManager.getLogger("HEALTH");
     private String name = "Default";
     private HealthyThreadPool healthyDispatchPool;
 

cuebot/src/main/java/com/imageworks/spcue/dispatcher/DispatchSupportService.java

@@ -39,7 +39,8 @@
 import com.imageworks.spcue.ShowInterface;
 import com.imageworks.spcue.StrandedCores;
 import com.imageworks.spcue.VirtualProc;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -64,7 +65,7 @@
 
 @Transactional(propagation = Propagation.REQUIRED)
 public class DispatchSupportService implements DispatchSupport {
-    private static final Logger logger = Logger.getLogger(DispatchSupportService.class);
+    private static final Logger logger = LogManager.getLogger(DispatchSupportService.class);
 
     private JobDao jobDao;
     private FrameDao frameDao;

cuebot/src/main/java/com/imageworks/spcue/dispatcher/FrameCompleteHandler.java

@@ -24,8 +24,8 @@
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicLong;
 
-import com.imageworks.spcue.*;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.dao.EmptyResultDataAccessException;
@@ -66,7 +66,7 @@
  */
 public class FrameCompleteHandler {
 
-    private static final Logger logger = Logger.getLogger(FrameCompleteHandler.class);
+    private static final Logger logger = LogManager.getLogger(FrameCompleteHandler.class);
 
     private static final Random randomNumber = new Random();
 

cuebot/src/main/java/com/imageworks/spcue/dispatcher/HealthyThreadPool.java

@@ -13,7 +13,8 @@
 import com.google.common.cache.CacheBuilder;
 import com.imageworks.spcue.dispatcher.commands.DispatchBookHost;
 import com.imageworks.spcue.dispatcher.commands.KeyRunnable;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 
 /***
@@ -24,7 +25,7 @@
  */
 public class HealthyThreadPool extends ThreadPoolExecutor {
     // The service need s to be unhealthy for this period of time to report
-    private static final Logger logger = Logger.getLogger("HEALTH");
+    private static final Logger logger = LogManager.getLogger("HEALTH");
     // Threshold to consider healthy or unhealthy
     private final int healthThreshold;
     private final int poolSize;

cuebot/src/main/java/com/imageworks/spcue/dispatcher/HostReportHandler.java

@@ -27,7 +27,8 @@
 import java.util.Map;
 import java.util.concurrent.ThreadPoolExecutor;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.core.task.TaskRejectedException;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.EmptyResultDataAccessException;
@@ -64,7 +65,7 @@
 
 public class HostReportHandler {
 
-    private static final Logger logger = Logger.getLogger(HostReportHandler.class);
+    private static final Logger logger = LogManager.getLogger(HostReportHandler.class);
 
     private BookingManager bookingManager;
     private HostManager hostManager;

cuebot/src/main/java/com/imageworks/spcue/dispatcher/HostReportQueue.java

@@ -26,16 +26,17 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import com.imageworks.spcue.grpc.report.HostReport;
-import org.apache.log4j.Logger;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import com.imageworks.spcue.dispatcher.commands.DispatchHandleHostReport;
 import com.imageworks.spcue.util.CueUtil;
 
 public class HostReportQueue extends ThreadPoolExecutor {
 
-    private static final Logger logger = Logger.getLogger(HostReportQueue.class);
+    private static final Logger logger = LogManager.getLogger(HostReportQueue.class);
     private QueueRejectCounter rejectCounter = new QueueRejectCounter();
     private AtomicBoolean isShutdown = new AtomicBoolean(false);
     private int queueCapacity;

cuebot/src/main/java/com/imageworks/spcue/dispatcher/LocalDispatcher.java

@@ -22,7 +22,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.dao.EmptyResultDataAccessException;
 
 import com.imageworks.spcue.DispatchFrame;
@@ -42,7 +43,7 @@
 public class LocalDispatcher extends AbstractDispatcher implements Dispatcher {
 
     private static final Logger logger =
-        Logger.getLogger(LocalDispatcher.class);
+        LogManager.getLogger(LocalDispatcher.class);
 
     private BookingManager bookingManager;
     private JobManager jobManager;

cuebot/src/main/java/com/imageworks/spcue/dispatcher/RedirectManager.java

@@ -21,7 +21,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import com.imageworks.spcue.DispatchHost;
 import com.imageworks.spcue.GroupInterface;
@@ -46,7 +47,7 @@
 
 public class RedirectManager {
 
-    private static final Logger logger = Logger.getLogger(RedirectManager.class);
+    private static final Logger logger = LogManager.getLogger(RedirectManager.class);
 
     private JobDao jobDao;
     private ProcDao procDao;

cuebot/src/main/java/com/imageworks/spcue/dispatcher/ThreadPoolTaskExecutorWrapper.java

@@ -19,7 +19,8 @@
 
 package com.imageworks.spcue.dispatcher;
 
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -31,7 +32,7 @@
  */
 public class ThreadPoolTaskExecutorWrapper extends ThreadPoolTaskExecutor {
 
-    private static final Logger logger = Logger.getLogger(ThreadPoolTaskExecutorWrapper.class);
+    private static final Logger logger = LogManager.getLogger(ThreadPoolTaskExecutorWrapper.class);
     private static final long serialVersionUID = -2977068663355369141L;
 
     private int queueCapacity;

cuebot/src/main/java/com/imageworks/spcue/dispatcher/commands/DispatchBookHost.java

@@ -21,7 +21,8 @@
 
 import java.util.List;
 import java.util.ArrayList;
-import org.apache.log4j.Logger;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import com.imageworks.spcue.DispatchHost;
 import com.imageworks.spcue.GroupInterface;
@@ -37,7 +38,7 @@
  */
 public class DispatchBookHost extends KeyRunnable {
     private static final Logger logger =
-            Logger.getLogger(DispatchBookHost.class);
+            LogManager.getLogger(DispatchBookHost.class);
 
     private ShowInterface show = null;
     private GroupInterface group = null;