From aceb410331ada72a7545524c3fba592058de67e2 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 10 Feb 2022 21:47:37 +0100 Subject: [PATCH] Stop using java.util.logging.Logger, start using slf4j --- src/main/java/net/server/Server.java | 3 +-- .../scripting/event/EventInstanceManager.java | 11 +++++---- .../java/scripting/event/EventManager.java | 23 ++++++++++--------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java index 1184860abc..0f8ee0b18c 100644 --- a/src/main/java/net/server/Server.java +++ b/src/main/java/net/server/Server.java @@ -884,8 +884,7 @@ public class Server { } } } catch (Exception e) { - e.printStackTrace();//For those who get errors - log.error("[SEVERE] Syntax error in 'world.ini'."); + log.error("[SEVERE] Syntax error in 'world.ini'.", e); //For those who get errors System.exit(0); } diff --git a/src/main/java/scripting/event/EventInstanceManager.java b/src/main/java/scripting/event/EventInstanceManager.java index 77d92fd0cc..6b8c90f539 100644 --- a/src/main/java/scripting/event/EventInstanceManager.java +++ b/src/main/java/scripting/event/EventInstanceManager.java @@ -34,6 +34,8 @@ import net.server.audit.locks.factory.MonitoredWriteLockFactory; import net.server.coordinator.world.EventRecallCoordinator; import net.server.world.Party; import net.server.world.PartyCharacter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import scripting.AbstractPlayerInteraction; import scripting.event.scheduler.EventScriptScheduler; import server.ItemInformationProvider; @@ -56,8 +58,6 @@ import java.awt.*; import java.util.List; import java.util.*; import java.util.concurrent.ScheduledFuture; -import java.util.logging.Level; -import java.util.logging.Logger; import static java.util.concurrent.TimeUnit.MINUTES; @@ -66,6 +66,7 @@ import static java.util.concurrent.TimeUnit.MINUTES; * @author Ronan */ public class EventInstanceManager { + private static final Logger log = LoggerFactory.getLogger(EventInstanceManager.class); private final Map chars = new HashMap<>(); private int leaderId = -1; private final List mobs = new LinkedList<>(); @@ -298,7 +299,7 @@ public class EventInstanceManager { try { invokeScriptFunction("scheduledTimeout", EventInstanceManager.this); } catch (ScriptException | NoSuchMethodException ex) { - Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, "Event '" + em.getName() + "' does not implement scheduledTimeout function.", ex); + log.error("Event script {} does not implement the scheduledTimeout function", em.getName(), ex); } }, time); } @@ -315,7 +316,7 @@ public class EventInstanceManager { try { invokeScriptFunction("scheduledTimeout", EventInstanceManager.this); } catch (ScriptException | NoSuchMethodException ex) { - Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, "Event '" + em.getName() + "' does not implement scheduledTimeout function.", ex); + log.error("Event script {} does not implement the scheduledTimeout function", em.getName(), ex); } }, nextTime); } @@ -387,7 +388,7 @@ public class EventInstanceManager { try { invokeScriptFunction("playerUnregistered", EventInstanceManager.this, chr); } catch (ScriptException | NoSuchMethodException ex) { - Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, "Event '" + em.getName() + "' does not implement playerUnregistered function.", ex); + log.error("Event script {} does not implement the playerUnregistered function", em.getName(), ex); } wL.lock(); diff --git a/src/main/java/scripting/event/EventManager.java b/src/main/java/scripting/event/EventManager.java index 518ddda775..34ce725f5e 100644 --- a/src/main/java/scripting/event/EventManager.java +++ b/src/main/java/scripting/event/EventManager.java @@ -34,6 +34,8 @@ import net.server.guild.Guild; import net.server.world.Party; import net.server.world.PartyCharacter; import net.server.world.World; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import scripting.event.scheduler.EventScriptScheduler; import server.Marriage; import server.ThreadManager; @@ -48,8 +50,6 @@ import javax.script.Invocable; import javax.script.ScriptException; import java.util.*; import java.util.concurrent.Semaphore; -import java.util.logging.Level; -import java.util.logging.Logger; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; @@ -60,6 +60,7 @@ import static java.util.concurrent.TimeUnit.SECONDS; * @author Ronan */ public class EventManager { + private static final Logger log = LoggerFactory.getLogger(EventManager.class); private Invocable iv; private Channel cserv; private World wserv; @@ -183,7 +184,7 @@ public class EventManager { try { iv.invokeFunction(methodName, eim); } catch (ScriptException | NoSuchMethodException ex) { - Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex); + log.error("Event script schedule", ex); } }; @@ -198,7 +199,7 @@ public class EventManager { try { iv.invokeFunction(methodName, (Object) null); } catch (ScriptException | NoSuchMethodException ex) { - Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex); + log.error("Event script scheduleAtTimestamp", ex); } }; @@ -432,7 +433,7 @@ public class EventManager { eim.startEvent(); } catch (ScriptException | NoSuchMethodException ex) { - Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex); + log.error("Event script startInstance", ex); } return true; @@ -504,7 +505,7 @@ public class EventManager { eim.startEvent(); } catch (ScriptException | NoSuchMethodException ex) { - Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex); + log.error("Event script startInstance", ex); } return true; @@ -576,7 +577,7 @@ public class EventManager { eim.startEvent(); } catch (ScriptException | NoSuchMethodException ex) { - Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex); + log.error("Event script startInstance", ex); } return true; @@ -648,7 +649,7 @@ public class EventManager { eim.startEvent(); } catch (ScriptException | NoSuchMethodException ex) { - Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex); + log.error("Event script startInstance", ex); } return true; @@ -715,7 +716,7 @@ public class EventManager { eim.startEvent(); } catch (ScriptException | NoSuchMethodException ex) { - Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex); + log.error("Event script startInstance", ex); } return true; @@ -755,7 +756,7 @@ public class EventManager { try { iv.invokeFunction("clearPQ", eim); } catch (ScriptException | NoSuchMethodException ex) { - Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex); + log.error("Event script clearPQ", ex); } } @@ -763,7 +764,7 @@ public class EventManager { try { iv.invokeFunction("clearPQ", eim, toMap); } catch (ScriptException | NoSuchMethodException ex) { - Logger.getLogger(EventManager.class.getName()).log(Level.SEVERE, null, ex); + log.error("Event script clearPQ", ex); } }