diff --git a/application/src/main/java/org/opentripplanner/standalone/OTPMain.java b/application/src/main/java/org/opentripplanner/standalone/OTPMain.java index 06b0fcc010c..a10f8f8ef7b 100644 --- a/application/src/main/java/org/opentripplanner/standalone/OTPMain.java +++ b/application/src/main/java/org/opentripplanner/standalone/OTPMain.java @@ -52,7 +52,7 @@ public static void main(String[] args) { try { Thread.currentThread().setName("main"); CommandLineParameters params = parseAndValidateCmdLine(args); - OtpStartupInfo.logInfo(params.logInfo()); + OtpStartupInfo.logInfo(params.logTaskInfo()); startOTPServer(params); } catch (OtpAppException ae) { LOG.error(ae.getMessage(), ae); diff --git a/application/src/main/java/org/opentripplanner/standalone/OtpStartupInfo.java b/application/src/main/java/org/opentripplanner/standalone/OtpStartupInfo.java index beae898d678..ddcc2c60212 100644 --- a/application/src/main/java/org/opentripplanner/standalone/OtpStartupInfo.java +++ b/application/src/main/java/org/opentripplanner/standalone/OtpStartupInfo.java @@ -34,18 +34,18 @@ private static String info() { ); } - public static void logInfo(String runInfo) { + public static void logInfo(String cliTaskInfo) { // This is good when aggregating logs across multiple load balanced instances of OTP // Hint: a regexp filter like "^OTP (START|SHUTTING)" will list nodes going up/down LOG.info( "OTP STARTING UP - {} - {} - Java {}", - runInfo, + cliTaskInfo, projectInfo().getVersionString(), javaVersion() ); ApplicationShutdownSupport.addShutdownHook( "server-shutdown-info", - () -> LOG.info("OTP SHUTTING DOWN - {} - {}", runInfo, projectInfo().getVersionString()) + () -> LOG.info("OTP SHUTTING DOWN - {} - {}", cliTaskInfo, projectInfo().getVersionString()) ); LOG.info(NEW_LINE + "{}", info()); } diff --git a/application/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java b/application/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java index 00fc7c75250..2324ce325d9 100644 --- a/application/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java +++ b/application/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java @@ -201,7 +201,7 @@ public boolean doServe() { return load || (serve && doBuildTransit()); } - public String logInfo() { + public String logTaskInfo() { var mainCommands = new ArrayList(); if (doBuildStreet() & doBuildTransit()) { mainCommands.add("Build Street & Transit Graph"); diff --git a/application/src/test/java/org/opentripplanner/standalone/config/CommandLineParametersTest.java b/application/src/test/java/org/opentripplanner/standalone/config/CommandLineParametersTest.java index fd2cb852444..0551d9e7056 100644 --- a/application/src/test/java/org/opentripplanner/standalone/config/CommandLineParametersTest.java +++ b/application/src/test/java/org/opentripplanner/standalone/config/CommandLineParametersTest.java @@ -52,7 +52,7 @@ public void build() { assertTrue(subject.doBuildTransit()); assertFalse(subject.doSaveGraph()); assertFalse(subject.doServe()); - assertEquals("Build Street & Transit Graph", subject.logInfo()); + assertEquals("Build Street & Transit Graph", subject.logTaskInfo()); subject.save = true; subject.serve = false; @@ -61,7 +61,7 @@ public void build() { assertTrue(subject.doSaveGraph()); assertFalse(subject.doServe()); subject.inferAndValidate(); - assertEquals("Build Street & Transit Graph", subject.logInfo()); + assertEquals("Build Street & Transit Graph", subject.logTaskInfo()); subject.save = false; subject.serve = true; @@ -70,7 +70,7 @@ public void build() { assertFalse(subject.doSaveGraph()); assertTrue(subject.doServe()); subject.inferAndValidate(); - assertEquals("Build Street & Transit Graph, Run Server", subject.logInfo()); + assertEquals("Build Street & Transit Graph, Run Server", subject.logTaskInfo()); subject.save = true; subject.serve = true; @@ -79,7 +79,7 @@ public void build() { assertTrue(subject.doSaveGraph()); assertTrue(subject.doServe()); subject.inferAndValidate(); - assertEquals("Build Street & Transit Graph, Run Server", subject.logInfo()); + assertEquals("Build Street & Transit Graph, Run Server", subject.logTaskInfo()); } @Test @@ -89,7 +89,7 @@ public void buildStreet() { assertFalse(subject.doBuildTransit()); assertTrue(subject.doSaveStreetGraph()); assertFalse(subject.doSaveGraph()); - assertEquals("Build Street Graph", subject.logInfo()); + assertEquals("Build Street Graph", subject.logTaskInfo()); } @Test @@ -97,7 +97,7 @@ public void doLoadGraph() { subject.load = true; assertTrue(subject.doLoadGraph()); assertTrue(subject.doServe()); - assertEquals("Run Server", subject.logInfo()); + assertEquals("Run Server", subject.logTaskInfo()); } @Test @@ -107,7 +107,7 @@ public void doLoadStreetGraph() { assertFalse(subject.doBuildStreet()); assertFalse(subject.doSaveStreetGraph()); assertFalse(subject.doSaveGraph()); - assertEquals("Build Transit Graph", subject.logInfo()); + assertEquals("Build Transit Graph", subject.logTaskInfo()); subject.save = true; subject.serve = true; @@ -128,7 +128,7 @@ public void validateLoad() { // Implicit given, but should be ok to set subject.serve = true; - assertEquals("Run Server", subject.logInfo()); + assertEquals("Run Server", subject.logTaskInfo()); // No exception thrown subject.inferAndValidate();