mirror of
https://github.com/bunkerity/bunkerweb
synced 2026-05-24 09:28:37 +00:00
Add a log when database is ready in UI + Small refactor of the Configurator
This commit is contained in:
parent
1e9a55c240
commit
e91f3dc226
2 changed files with 4 additions and 4 deletions
|
|
@ -47,9 +47,7 @@ class Configurator:
|
|||
else:
|
||||
self.__variables = variables
|
||||
|
||||
self.__multisite = (
|
||||
"MULTISITE" in self.__variables and self.__variables["MULTISITE"] == "yes"
|
||||
)
|
||||
self.__multisite = self.__variables.get("MULTISITE", "no") == "yes"
|
||||
self.__servers = self.__map_servers()
|
||||
|
||||
def get_settings(self):
|
||||
|
|
|
|||
|
|
@ -38,6 +38,8 @@ class Config:
|
|||
sleep(3)
|
||||
env = self.__db.get_config()
|
||||
|
||||
self.__logger.info("Database is ready")
|
||||
|
||||
def __env_to_dict(self, filename: str) -> dict:
|
||||
"""Converts the content of an env file into a dict
|
||||
|
||||
|
|
@ -112,7 +114,7 @@ class Config:
|
|||
servers.append(server_name)
|
||||
|
||||
conf["SERVER_NAME"] = " ".join(servers)
|
||||
env_file = "/tmp/" + str(uuid4()) + ".env"
|
||||
env_file = f"/tmp/{uuid4()}.env"
|
||||
self.__dict_to_env(env_file, conf)
|
||||
proc = run(
|
||||
[
|
||||
|
|
|
|||
Loading…
Reference in a new issue