diff --git a/src/main/java/net/doubledoordev/backend/Main.java b/src/main/java/net/doubledoordev/backend/Main.java index d634909..8e74925 100644 --- a/src/main/java/net/doubledoordev/backend/Main.java +++ b/src/main/java/net/doubledoordev/backend/Main.java @@ -50,6 +50,7 @@ import net.doubledoordev.backend.web.socket.*; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.util.Strings; import org.glassfish.grizzly.http.server.CLStaticHttpHandler; import org.glassfish.grizzly.http.server.HttpServer; import org.glassfish.grizzly.http.server.NetworkListener; @@ -148,7 +149,7 @@ public static void main(String[] args) throws Exception ConsoleSocketApplication.register(); AdvancedSettingsSocketApplication.register(); - final NetworkListener networkListener = new NetworkListener("secured-listener"); + final NetworkListener networkListener = new NetworkListener("secured-listener", Strings.isBlank(SETTINGS.hostname) ? NetworkListener.DEFAULT_NETWORK_HOST : SETTINGS.hostname, SETTINGS.portHTTP); //networkListener.setSecure(true); //networkListener.setSSLEngineConfig(createSslConfiguration()); webserver.addListener(networkListener); diff --git a/src/main/java/net/doubledoordev/backend/server/RestartingInfo.java b/src/main/java/net/doubledoordev/backend/server/RestartingInfo.java index 2fb5717..26c4016 100644 --- a/src/main/java/net/doubledoordev/backend/server/RestartingInfo.java +++ b/src/main/java/net/doubledoordev/backend/server/RestartingInfo.java @@ -55,11 +55,11 @@ public class RestartingInfo @Expose public int globalTimeout = 24; @Expose - public int whenEmpty = 30; + public int whenEmptyTimeout = 30; @Expose - public boolean timer = false; + public boolean scheduleTimeout = false; @Expose - public boolean restartDailyTimeout = false; + public int restartDailyTimeout = 0; private boolean restartNextRun = false; private Date lastRestart = new Date(0L); @@ -83,6 +83,6 @@ public void run(Server server) public String getLastRestart(String format) { - return new SimpleDateFormat(format).format(lastRestart); + return lastRestart.getTime() == 0L ? "" : new SimpleDateFormat(format).format(lastRestart); } } diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 43edbac..0a873b9 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -47,7 +47,7 @@ - + @@ -61,14 +61,6 @@ - - - - - - - -