From 070aeb35d71b14f8e9ecf58fba0123897fc61def Mon Sep 17 00:00:00 2001
From: Ziver Koc <ziver@koc.se>
Date: Tue, 16 May 2023 01:13:53 +0200
Subject: [PATCH] Reshuffled init order to allow web server port modification

---
 hal-core/src/se/hal/HalContext.java |  2 +-
 hal-core/src/se/hal/HalServer.java  | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/hal-core/src/se/hal/HalContext.java b/hal-core/src/se/hal/HalContext.java
index e6c3bc19..c9f1184f 100644
--- a/hal-core/src/se/hal/HalContext.java
+++ b/hal-core/src/se/hal/HalContext.java
@@ -54,7 +54,7 @@ public class HalContext {
     private static UserMessageManager messageManager = new UserMessageManager();
 
     static {
-        // Set default values to get Hal up and running
+        // Set default values to get Hal up and running before DB is read in
         fileConf.setProperty(CONFIG_HTTP_PORT, "" + 8080);
     }
 
diff --git a/hal-core/src/se/hal/HalServer.java b/hal-core/src/se/hal/HalServer.java
index bdc98628..ff46d73f 100644
--- a/hal-core/src/se/hal/HalServer.java
+++ b/hal-core/src/se/hal/HalServer.java
@@ -47,27 +47,28 @@ public class HalServer {
             // Initialize Hal
             // ------------------------------------
 
-            // init logging
+            // Init basic dependencies
+
             LogUtil.readConfiguration("logging.properties");
+            HalContext.initialize();
+            DBConnection db = HalContext.getDB();
+
+            pluginManager = new PluginManager();
+            daemonExecutor = Executors.newScheduledThreadPool(1); // We set only one thread for easier troubleshooting for now
+
+            // Init core web server
 
             http = new HttpServer(HalContext.getIntegerProperty(HalContext.CONFIG_HTTP_PORT));
             http.setDefaultPage(new StartupWebPage());
             http.start();
 
-            // init variables
-            pluginManager = new PluginManager();
-            daemonExecutor = Executors.newScheduledThreadPool(1); // We set only one thread for easier troubleshooting for now
-
             // Upgrade database
+
+            logger.info("Working directory: " + FileUtil.find(".").getAbsolutePath());
             HalDatabaseUpgradeManager.initialize(pluginManager);
             HalDatabaseUpgradeManager.upgrade();
 
-            // init DB and other configurations
-
-            HalContext.initialize();
-            DBConnection db = HalContext.getDB();
-
-            logger.info("Working directory: " + FileUtil.find(".").getAbsolutePath());
+            // Init external web server
 
             httpExternal = new HalExternalWebDaemon();
             registerDaemon(httpExternal);