From bcdd01448fcbba28d381785bf987c51a2cee6e2a Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 19 Nov 2023 09:31:10 -0500 Subject: [PATCH] Router: Don't log updated/started/stopped/crashed events when in test mode --- router/java/src/net/i2p/router/Router.java | 8 +++++--- router/java/src/net/i2p/router/tasks/ShutdownHook.java | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/router/java/src/net/i2p/router/Router.java b/router/java/src/net/i2p/router/Router.java index 989b915f3..a013d6048 100644 --- a/router/java/src/net/i2p/router/Router.java +++ b/router/java/src/net/i2p/router/Router.java @@ -684,11 +684,12 @@ public class Router implements RouterClock.ClockShiftListener { changeState(State.STARTING_1); } String last = _config.get("router.previousFullVersion"); - if (last != null) { + if (last != null && !_context.getBooleanProperty("i2p.vmCommSystem")) { _eventLog.addEvent(EventLog.UPDATED, "from " + last + " to " + RouterVersion.FULL_VERSION); saveConfig("router.previousFullVersion", null); } - _eventLog.addEvent(EventLog.STARTED, RouterVersion.FULL_VERSION); + if (!_context.getBooleanProperty("i2p.vmCommSystem")) + _eventLog.addEvent(EventLog.STARTED, RouterVersion.FULL_VERSION); startupStuff(); changeState(State.STARTING_2); _started = System.currentTimeMillis(); @@ -1640,7 +1641,8 @@ public class Router implements RouterClock.ClockShiftListener { // logManager shut down in finalShutdown() _watchdog.shutdown(); _watchdogThread.interrupt(); - _eventLog.addEvent(EventLog.STOPPED, Integer.toString(exitCode)); + if (!_context.commSystem().isDummy()) + _eventLog.addEvent(EventLog.STOPPED, Integer.toString(exitCode)); finalShutdown(exitCode); } diff --git a/router/java/src/net/i2p/router/tasks/ShutdownHook.java b/router/java/src/net/i2p/router/tasks/ShutdownHook.java index 135494417..385961478 100644 --- a/router/java/src/net/i2p/router/tasks/ShutdownHook.java +++ b/router/java/src/net/i2p/router/tasks/ShutdownHook.java @@ -39,7 +39,8 @@ public class ShutdownHook extends Thread { // Needed to make the wrapper happy, otherwise it gets confused // and thinks we haven't shut down, possibly because it // prevents other shutdown hooks from running - _context.router().eventLog().addEvent(EventLog.CRASHED, RouterVersion.FULL_VERSION); + if (!_context.commSystem().isDummy()) + _context.router().eventLog().addEvent(EventLog.CRASHED, RouterVersion.FULL_VERSION); _context.router().setKillVMOnEnd(false); _context.router().shutdown2(Router.EXIT_HARD); }