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/Main.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/Main.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/Main.java
index 0ef680e..88d2829 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/Main.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/Main.java
@@ -1,6 +1,7 @@
package de.micromata.borgbutler.server;
import de.micromata.borgbutler.cache.ButlerCache;
+import de.micromata.borgbutler.config.ConfigurationHandler;
import de.micromata.borgbutler.json.borg.BorgFilesystemItem;
import de.micromata.borgbutler.server.jetty.JettyServer;
import de.micromata.borgbutler.server.user.SingleUserManager;
@@ -45,6 +46,7 @@
private void _start(String[] args) {
+ ConfigurationHandler.setConfigClazz(ServerConfiguration.class);
// create Options object
Options options = new Options();
options.addOption("e", "extract-archive-content", true, "Extracts the content of an archive cache file only (doesn't start the server). A complete file list of the archive will be extracted to stdout.");
@@ -73,7 +75,7 @@
System.err.println("Port outside range.");
return;
}
- ServerConfigurationHandler.getDefaultConfiguration().setPort(port);
+ ServerConfiguration.get().setPort(port);
} catch (NumberFormatException ex) {
printHelp(options);
return;
--
Gitblit v1.10.0