From ffc27d1d6427e827877416aa01afae123b65379c Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sun, 15 Nov 2020 09:58:17 -0500 Subject: [PATCH] print server version upon startup --- .../wizard/server/config/RestServerConfiguration.java | 2 ++ .../wizard/server/listener/BrowserLauncherListener.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/RestServerConfiguration.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/RestServerConfiguration.java index 6fe8878..77a4eeb 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/RestServerConfiguration.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/config/RestServerConfiguration.java @@ -53,6 +53,8 @@ public class RestServerConfiguration { @Getter @Setter private File tmpdir = FileUtil.getDefaultTempDir(); @Getter @Setter private String serverName; + @Getter @Setter private String version; + public boolean hasVersion () { return !empty(version); } @Setter private String publicUriBase; public String getPublicUriBase () { diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/BrowserLauncherListener.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/BrowserLauncherListener.java index 3ba7f02..7e422e2 100644 --- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/BrowserLauncherListener.java +++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/listener/BrowserLauncherListener.java @@ -30,7 +30,10 @@ public class BrowserLauncherListener extends RestServerLifecycleListenerBase { } } else { // no browser. tell the user where the server is listening via log statement - log.info("\n\n"+server.getConfiguration().getServerName()+" Successfully Started\n\nNot launching browser: System lacks a browser and/or desktop window manager.\n\nWeb UI is: "+baseUri+"\nAPI is: "+baseUri+"/api\nHit Control-C to stop the server\n"); + final String versionInfo = server.getConfiguration().hasVersion() + ? "\nVersion: " + server.getConfiguration().getVersion() + : ""; + log.info("\n\n"+server.getConfiguration().getServerName()+" Successfully Started"+versionInfo+"\n\nNot launching browser: System lacks a browser and/or desktop window manager.\n\nWeb UI is: "+baseUri+"\nAPI is: "+baseUri+"/api\nHit Control-C to stop the server\n"); } } });