From e65913d37614c9fdd1207a63e8cd6bd5e55f081e Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sun, 20 Mar 2022 11:30:03 +0100 Subject: [PATCH] cache loaded configuration Reading the YAML files is fairly expensive and slows down the BDD tests significantly. Therefore cache the results from reading the file. --- nominatim/config.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/nominatim/config.py b/nominatim/config.py index 785f4acd..13d9cd8a 100644 --- a/nominatim/config.py +++ b/nominatim/config.py @@ -18,7 +18,7 @@ from dotenv import dotenv_values from nominatim.errors import UsageError LOG = logging.getLogger() - +CONFIG_CACHE = {} def flatten_config_list(content, section=''): """ Flatten YAML configuration lists that contain include sections @@ -181,14 +181,19 @@ class Configuration: """ configfile = self.find_config_file(filename, config) - if configfile.suffix in ('.yaml', '.yml'): - return self._load_from_yaml(configfile) + if str(configfile) in CONFIG_CACHE: + return CONFIG_CACHE[str(configfile)] - if configfile.suffix == '.json': + if configfile.suffix in ('.yaml', '.yml'): + result = self._load_from_yaml(configfile) + elif configfile.suffix == '.json': with configfile.open('r') as cfg: - return json.load(cfg) + result = json.load(cfg) + else: + raise UsageError(f"Config file '{configfile}' has unknown format.") - raise UsageError(f"Config file '{configfile}' has unknown format.") + CONFIG_CACHE[str(configfile)] = result + return result def find_config_file(self, filename, config=None): -- 2.39.5