From 0bdefbf053beb80736eff0a13fe8b90618c8d6dc Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Fri, 21 Dec 2018 22:56:09 +0000
Subject: [PATCH] ServerConfiguration is also stored in json.
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java
index 38a84fa..4f04b29 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/jetty/JettyServer.java
@@ -1,7 +1,6 @@
package de.micromata.borgbutler.server.jetty;
import de.micromata.borgbutler.server.ServerConfiguration;
-import de.micromata.borgbutler.server.ServerConfigurationHandler;
import de.micromata.borgbutler.server.RunningMode;
import de.micromata.borgbutler.server.rest.ConfigurationRest;
import de.micromata.borgbutler.server.user.UserFilter;
@@ -99,7 +98,7 @@
errorHandler.addErrorPage(404, "/");
ctx.setErrorHandler(errorHandler);
- if (RunningMode.isDevelopmentMode() || ServerConfigurationHandler.getDefaultConfiguration().isWebDevelopmentMode()) {
+ if (RunningMode.isDevelopmentMode() || ServerConfiguration.get().isWebDevelopmentMode()) {
log.warn("*********************************");
log.warn("*********** **********");
log.warn("*********** ATTENTION! **********");
@@ -139,7 +138,7 @@
}
private int findFreePort() {
- int port = ServerConfigurationHandler.getInstance().getConfiguration().getPort();
+ int port = ServerConfiguration.get().getPort();
return findFreePort(port);
}
@@ -147,7 +146,7 @@
int port = startPort > 0 ? startPort : 1;
if (port > MAX_PORT_NUMBER) {
log.warn("Port can't be higher than " + MAX_PORT_NUMBER + ": " + port + ". It's a possible mis-configuration.");
- port = ServerConfigurationHandler.WEBSERVER_PORT_DEFAULT;
+ port = ServerConfiguration.WEBSERVER_PORT_DEFAULT;
}
for (int i = port; i < port + 10; i++) {
try (ServerSocket socket = new ServerSocket()) {
@@ -158,9 +157,9 @@
continue; // try next port
}
}
- if (startPort != ServerConfigurationHandler.WEBSERVER_PORT_DEFAULT) {
+ if (startPort != ServerConfiguration.WEBSERVER_PORT_DEFAULT) {
log.info("Trying to fix port due to a possible mis-configuration.");
- return findFreePort(ServerConfigurationHandler.WEBSERVER_PORT_DEFAULT);
+ return findFreePort(ServerConfiguration.WEBSERVER_PORT_DEFAULT);
}
log.error("No free port found! Giving up.");
return -1;
--
Gitblit v1.10.0