From bb18c55003f2b6d2867b5d051c0096f87ccb861f Mon Sep 17 00:00:00 2001
From: DaanSelen <dselen@nerthus.nl>
Date: Mon, 16 Feb 2026 18:54:10 +0100
Subject: [PATCH] fix: Configuration creation bug due to failed Nonetype
 checking

---
 docker/entrypoint.sh              | 12 ++++++++++--
 src/modules/DashboardConfig.py    |  2 ++
 src/modules/DatabaseConnection.py |  3 ---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index b1e51693..22292132 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -176,8 +176,16 @@ set_envvars() {
   set_ini Peers peer_global_dns "${global_dns}"
 
   if [ -z "${public_ip}" ]; then
-    public_ip=$(curl -s ifconfig.me)
-    echo "Automatically detected public IP: ${public_ip}" 
+    public_ip=$(curl -s https://ifconfig.me)
+    if [ -z "${public_ip}" ]; then
+        echo "Using fallback public IP resolution website"
+        public_ip=$(curl -s https://api.ipify.org)
+    fi
+    if [ -z "${public_ip}" ]; then
+        echo "Failed to resolve publicly. Using private address."
+        public_ip=$(hostname -i)
+    fi
+    echo "Automatically detected public IP: ${public_ip}"
   fi
 
   set_ini Peers remote_endpoint "${public_ip}"
diff --git a/src/modules/DashboardConfig.py b/src/modules/DashboardConfig.py
index 0095cba7..4c40af8a 100644
--- a/src/modules/DashboardConfig.py
+++ b/src/modules/DashboardConfig.py
@@ -135,6 +135,8 @@ class DashboardConfig:
                 ]
 
                 for table_name in tables_to_check:
+                    if not table_name:
+                        continue
                     if not inspector.has_table(table_name):
                         continue
 
diff --git a/src/modules/DatabaseConnection.py b/src/modules/DatabaseConnection.py
index e61cd7bd..e3d7d1a0 100644
--- a/src/modules/DatabaseConnection.py
+++ b/src/modules/DatabaseConnection.py
@@ -1,7 +1,6 @@
 import configparser
 import os
 from sqlalchemy_utils import database_exists, create_database
-from flask import current_app
 
 def ConnectionString(database) -> str:    
     parser = configparser.ConfigParser(strict=False)
@@ -20,9 +19,7 @@ def ConnectionString(database) -> str:
     try:
         if not database_exists(cn):
             create_database(cn)
-            current_app.logger.info(f"Database {database} created.")
     except Exception as e:
-        current_app.logger.error("Database error. Terminating...", e)
         exit(1)
 
     return cn
\ No newline at end of file