Prevent booking frames on hosts with full MCP

- Use correct Logger imports
AcademySoftwareFoundation · Jul 18, 2023 · 59c978e · 59c978e
1 parent 91e06b2
commit 59c978e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/cuebot/src/main/java/com/imageworks/spcue/dispatcher/HostReportHandler.java b/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.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.core.task.TaskRejectedException;
@@ -68,7 +69,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;

diff --git a/cuebot/src/main/java/com/imageworks/spcue/dispatcher/HostReportQueue.java b/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;

diff --git a/cuebot/src/main/java/com/imageworks/spcue/service/HostManagerService.java b/cuebot/src/main/java/com/imageworks/spcue/service/HostManagerService.java
@@ -22,7 +22,8 @@
 import java.sql.Timestamp;
 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 org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -57,7 +58,7 @@
 
 @Transactional
 public class HostManagerService implements HostManager {
-    private static final Logger logger = Logger.getLogger(HostManagerService.class);
+    private static final Logger logger = LogManager.getLogger(HostManagerService.class);
 
     private HostDao hostDao;
     private RqdClient rqdClient;