Merge pull request #327 from TheophileDiot/1.5

Get all config with generator

autoconf/Config.py

@@ -1,4 +1,3 @@
-from logging import Logger
 from traceback import format_exc
 from subprocess import run, DEVNULL, STDOUT
 from glob import glob
@@ -54,23 +53,6 @@ class Config(ApiCaller, ConfigCaller):
             return True
         return False
 
-    def __get_config(self) -> dict:
-        config = {}
-        # extract instances variables
-        for instance in self.__instances:
-            for variable, value in instance["env"].items():
-                config[variable] = value
-        # extract services variables
-        server_names = []
-        for service in self.__services:
-            first_server = service["SERVER_NAME"].split(" ")[0]
-            if not first_server in server_names:
-                server_names.append(first_server)
-            for variable, value in service.items():
-                config[f"{first_server}_{variable}"] = value
-        config["SERVER_NAME"] = " ".join(server_names)
-        return config
-
     def __get_apis(self) -> list:
         apis = []
         for instance in self.__instances:

bw/gen/Configurator.py

@@ -135,9 +135,7 @@ class Configurator:
                         if key not in config:
                             if setting == "SERVER_NAME":
                                 config[key] = server_name
-                            elif (
-                                setting in config and config[setting] != data["default"]
-                            ):
+                            elif setting in config:
                                 config[key] = config[setting]
         return config