Move the configuration file handling code into a separate module

scripts/casefold_db.py

@@ -253,6 +253,7 @@ def update_global_associations(
     config = parse_config_file(args.config_path)
 
     sydent_config = SydentConfig()
+    sydent_config.parse_from_config_parser(config)
 
     reactor = ResolvingMemoryReactorClock()
     sydent = Sydent(config, sydent_config, reactor, False)

sydent/config/__init__.py

@@ -14,6 +14,8 @@
 
 from configparser import ConfigParser
 
+from sydent.config.database import DatabaseConfig
+
 
 class ConfigError(Exception):
     pass
@@ -26,7 +28,9 @@ class SydentConfig:
     """
 
     def __init__(self):
-        self.config_sections = []
+        self.database = DatabaseConfig()
+
+        self.config_sections = [self.database]
 
     def _parse_config(self, cfg: ConfigParser) -> None:
         """
@@ -37,3 +41,11 @@ def _parse_config(self, cfg: ConfigParser) -> None:
         """
         for section in self.config_sections:
             section.parse_config(cfg)
+
+    def parse_from_config_parser(self, cfg: ConfigParser) -> None:
+        """
+        Parse the configuration from a ConfigParser object
+
+        :param cfg: the configuration to be parsed
+        """
+        self._parse_config(cfg)

sydent/config/database.py

@@ -0,0 +1,28 @@
+# Copyright 2021 The Matrix.org Foundation C.I.C.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from configparser import ConfigParser
+
+
+class DatabaseConfig:
+    def parse_config(self, cfg: "ConfigParser") -> None:
+        """
+        Parse the database section of the config
+
+        :param cfg: the configuration to be parsed
+        """
+        self.database_path = cfg.get("db", "db.file")

sydent/db/sqlitedb.py

@@ -28,7 +28,7 @@ class SqliteDatabase:
     def __init__(self, syd: "Sydent") -> None:
         self.sydent = syd
 
-        dbFilePath = self.sydent.cfg.get("db", "db.file")
+        dbFilePath = self.sydent.config.database.database_path
         logger.info("Using DB file %s", dbFilePath)
 
         self.db = sqlite3.connect(dbFilePath)

sydent/sydent.py

@@ -610,5 +610,7 @@ def run_gc():
     setup_logging(cfg)
 
     sydent_config = SydentConfig()
+    sydent_config.parse_from_config_parser(cfg)
+
     syd = Sydent(cfg, sydent_config=sydent_config)
     syd.run()

tests/utils.py

@@ -70,11 +70,14 @@ def make_sydent(test_config={}):
 
     reactor = ResolvingMemoryReactorClock()
 
+    cfg = parse_config_dict(test_config)
+
     sydent_config = SydentConfig()
+    sydent_config.parse_from_config_parser(cfg)
 
     return Sydent(
         reactor=reactor,
-        cfg=parse_config_dict(test_config),
+        cfg=cfg,
         sydent_config=sydent_config,
         use_tls_for_federation=False,
     )