ui - various bug fixes more or less related to UI

This commit is contained in:
florian
2021-08-09 13:19:10 +02:00
parent 2ec28c79cb
commit bcd421de09
10 changed files with 38 additions and 22 deletions

View File

@@ -13,6 +13,8 @@ class Config :
env = f.read()
data = {}
for line in env.split("\n") :
if not "=" in line :
continue
var = line.split("=")[0]
val = line.replace(var + "=", "", 1)
data[var] = val
@@ -37,7 +39,8 @@ class Config :
if not first_server in servers :
servers.append(first_server)
for k, v in service.items() :
conf[first_server + "_" + k] = v
if not k.startswith(first_server + "_") :
conf[first_server + "_" + k] = v
conf["SERVER_NAME"] = " ".join(servers)
env_file = "/tmp/" + str(uuid.uuid4()) + ".env"
self.__dict_to_env(env_file, conf)

View File

@@ -34,6 +34,7 @@ class Instances :
result = False
except :
result = False
return result
def __instance_from_id(self, id) :
instances = self.get_instances()
@@ -91,7 +92,6 @@ class Instances :
all_reload = False
elif instance["type"] == "container" or instance["type"] == "service" :
all_reload = self.__api_request(instance, "/reload")
return all_reload
def reload_instance(self, id) :