mirror of
https://github.com/donaldzou/WGDashboard.git
synced 2026-02-22 16:46:17 +00:00
fix: Configuration creation bug due to failed Nonetype checking
This commit is contained in:
@@ -176,7 +176,15 @@ set_envvars() {
|
|||||||
set_ini Peers peer_global_dns "${global_dns}"
|
set_ini Peers peer_global_dns "${global_dns}"
|
||||||
|
|
||||||
if [ -z "${public_ip}" ]; then
|
if [ -z "${public_ip}" ]; then
|
||||||
public_ip=$(curl -s ifconfig.me)
|
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}"
|
echo "Automatically detected public IP: ${public_ip}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -135,6 +135,8 @@ class DashboardConfig:
|
|||||||
]
|
]
|
||||||
|
|
||||||
for table_name in tables_to_check:
|
for table_name in tables_to_check:
|
||||||
|
if not table_name:
|
||||||
|
continue
|
||||||
if not inspector.has_table(table_name):
|
if not inspector.has_table(table_name):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
import configparser
|
import configparser
|
||||||
import os
|
import os
|
||||||
from sqlalchemy_utils import database_exists, create_database
|
from sqlalchemy_utils import database_exists, create_database
|
||||||
from flask import current_app
|
|
||||||
|
|
||||||
def ConnectionString(database) -> str:
|
def ConnectionString(database) -> str:
|
||||||
parser = configparser.ConfigParser(strict=False)
|
parser = configparser.ConfigParser(strict=False)
|
||||||
@@ -20,9 +19,7 @@ def ConnectionString(database) -> str:
|
|||||||
try:
|
try:
|
||||||
if not database_exists(cn):
|
if not database_exists(cn):
|
||||||
create_database(cn)
|
create_database(cn)
|
||||||
current_app.logger.info(f"Database {database} created.")
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
current_app.logger.error("Database error. Terminating...", e)
|
|
||||||
exit(1)
|
exit(1)
|
||||||
|
|
||||||
return cn
|
return cn
|
||||||
Reference in New Issue
Block a user