X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/1c42780bb5b1519ba0ebe2126264f0851bbd1c04..97a10ec2186faa9aa53a215662714c760e980a00:/nominatim/config.py

diff --git a/nominatim/config.py b/nominatim/config.py
index c859a9d1..f316280b 100644
--- a/nominatim/config.py
+++ b/nominatim/config.py
@@ -12,6 +12,27 @@ from nominatim.errors import UsageError
 
 LOG = logging.getLogger()
 
+
+def flatten_config_list(content, section=''):
+    """ Flatten YAML configuration lists that contain include sections
+        which are lists themselves.
+    """
+    if not content:
+        return []
+
+    if not isinstance(content, list):
+        raise UsageError(f"List expected in section '{section}'.")
+
+    output = []
+    for ele in content:
+        if isinstance(ele, list):
+            output.extend(flatten_config_list(ele, section))
+        else:
+            output.append(ele)
+
+    return output
+
+
 class Configuration:
     """ Load and manage the project configuration.
 
@@ -54,7 +75,10 @@ class Configuration:
     def __getattr__(self, name):
         name = 'NOMINATIM_' + name
 
-        return self.environ.get(name) or self._config[name]
+        if name in self.environ:
+            return self.environ[name]
+
+        return self._config[name]
 
     def get_bool(self, name):
         """ Return the given configuration parameter as a boolean.
@@ -137,12 +161,9 @@ class Configuration:
             is loaded using this function and added at the position in the
             configuration tree.
         """
-        configfile = self._find_config_file(filename, config)
+        assert Path(filename).suffix == '.yaml'
 
-        if configfile.suffix != '.yaml':
-            LOG.format("Format error while reading '%s': only YAML format supported.",
-                       configfile)
-            raise UsageError("Cannot handle config file format.")
+        configfile = self._find_config_file(filename, config)
 
         return self._load_from_yaml(configfile)
 
@@ -158,21 +179,21 @@ class Configuration:
             if cfg_filename:
                 cfg_filename = Path(cfg_filename)
 
-                if not cfg_filename.is_absolute():
-                    cfg_filename = self.project_dir / cfg_filename
+                if cfg_filename.is_absolute():
+                    cfg_filename = cfg_filename.resolve()
 
-                cfg_filename = cfg_filename.resolve()
+                    if not cfg_filename.is_file():
+                        LOG.fatal("Cannot find config file '%s'.", cfg_filename)
+                        raise UsageError("Config file not found.")
 
-                if not cfg_filename.is_file():
-                    LOG.fatal("Cannot find config file '%s'.", cfg_filename)
-                    raise UsageError("Config file not found.")
+                    return cfg_filename
 
-                return cfg_filename
+                filename = cfg_filename
 
 
         search_paths = [self.project_dir, self.config_dir]
         for path in search_paths:
-            if (path / filename).is_file():
+            if path is not None and (path / filename).is_file():
                 return path / filename
 
         LOG.fatal("Configuration file '%s' not found.\nDirectories searched: %s",
@@ -203,8 +224,8 @@ class Configuration:
             configfile = self._find_config_file(loader.construct_scalar(node))
 
         if configfile.suffix != '.yaml':
-            LOG.format("Format error while reading '%s': only YAML format supported.",
-                       configfile)
+            LOG.fatal("Format error while reading '%s': only YAML format supported.",
+                      configfile)
             raise UsageError("Cannot handle config file format.")
 
         return yaml.safe_load(configfile.read_text(encoding='utf-8'))