Set env_prefix before reading env

Author: tulir

mautrix/bridge/bridge.py

@@ -107,18 +107,21 @@ def preinit(self) -> None:
 
     def prepare(self) -> None:
         if self.config.env:
-            self.log.debug("Loaded config overrides from environment: %s", self.config.env.keys())
+            self.log.debug(
+                "Loaded config overrides from environment: %s", list(self.config.env.keys())
+            )
         super().prepare()
         self.prepare_db()
         self.prepare_appservice()
         self.prepare_bridge()
 
     def prepare_config(self) -> None:
         self.config = self.config_class(
-            self.args.config, self.args.registration, self.args.base_config
+            self.args.config,
+            self.args.registration,
+            self.args.base_config,
+            env_prefix=self.module.upper(),
         )
-        if not self.config.env_prefix:
-            self.config.env_prefix = self.module.upper()
         if self.args.generate_registration:
             self.config._check_tokens = False
         self.load_and_update_config()

mautrix/bridge/config.py

@@ -29,12 +29,16 @@ class BaseBridgeConfig(BaseFileConfig, BaseValidatableConfig, ABC):
     _check_tokens: bool
     env: dict[str, Any]
 
-    def __init__(self, path: str, registration_path: str, base_path: str) -> None:
+    def __init__(
+        self, path: str, registration_path: str, base_path: str, env_prefix: str | None = None
+    ) -> None:
         super().__init__(path, base_path)
         self.registration_path = registration_path
         self._registration = None
         self._check_tokens = True
         self.env = {}
+        if not self.env_prefix:
+            self.env_prefix = env_prefix
         if self.env_prefix:
             env_prefix = f"{self.env_prefix}_"
             for key, value in os.environ.items():