From 4fd87eb605053c73bdd6dd2d77f4ebc0e2512d14 Mon Sep 17 00:00:00 2001 From: heavyrain2012 Date: Mon, 20 Sep 2021 21:01:40 +0800 Subject: [PATCH] add run time in version info --- broker/src/main/java/io/moquette/server/Server.java | 8 ++++++++ .../src/main/java/win/liyufan/im/GitRepositoryState.java | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/broker/src/main/java/io/moquette/server/Server.java b/broker/src/main/java/io/moquette/server/Server.java index 6d3fde2a..e0a76deb 100755 --- a/broker/src/main/java/io/moquette/server/Server.java +++ b/broker/src/main/java/io/moquette/server/Server.java @@ -80,6 +80,7 @@ public class Server { } private ServerAcceptor m_acceptor; + private long startTime; private boolean m_shutdowning = false; @@ -102,6 +103,10 @@ public class Server { System.out.println(BANNER); } + public Server() { + startTime = System.currentTimeMillis(); + } + public static void start(String[] args) throws IOException { instance = new Server(); final IConfig config = defaultConfig(); @@ -513,4 +518,7 @@ public class Server { public ThreadPoolExecutorWrapper getCallbackScheduler() { return callbackScheduler; } + public long getRunTime() { + return (System.currentTimeMillis() - startTime)/1000; + } } diff --git a/broker/src/main/java/win/liyufan/im/GitRepositoryState.java b/broker/src/main/java/win/liyufan/im/GitRepositoryState.java index fa2e94f0..7031c321 100644 --- a/broker/src/main/java/win/liyufan/im/GitRepositoryState.java +++ b/broker/src/main/java/win/liyufan/im/GitRepositoryState.java @@ -8,6 +8,8 @@ package win.liyufan.im; +import io.moquette.server.Server; + import java.io.*; import java.util.Properties; @@ -34,10 +36,8 @@ public class GitRepositoryState { public final String buildTime; public final String buildHost; public final String buildVersion; - public final long runTime; - private final static long startTime = System.currentTimeMillis(); private GitRepositoryState(Properties properties) { this.tags = String.valueOf(properties.get("git.tags")); @@ -62,7 +62,7 @@ public class GitRepositoryState { this.buildTime = String.valueOf(properties.get("git.build.time")); this.buildHost = String.valueOf(properties.get("git.build.host")); this.buildVersion = String.valueOf(properties.get("git.build.version")); - this.runTime = (System.currentTimeMillis() - startTime)/1000; + this.runTime = Server.getServer().getRunTime(); } public static GitRepositoryState getGitRepositoryState() throws IOException {