From 6d548aefbeb5a4a68764c64b33f131a3f9413737 Mon Sep 17 00:00:00 2001 From: Alexander Kukushkin Date: Wed, 9 Aug 2023 14:48:18 +0200 Subject: [PATCH] Silence useless warnings in patronictl (#2808) Close https://github.com/zalando/patroni/issues/2805 --- patroni/config.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/patroni/config.py b/patroni/config.py index d2770517..78523dfc 100644 --- a/patroni/config.py +++ b/patroni/config.py @@ -224,7 +224,8 @@ class Config(object): self.__effective_configuration = self._build_effective_configuration({}, self._local_configuration) self._data_dir = self.__effective_configuration.get('postgresql', {}).get('data_dir', "") self._cache_file = os.path.join(self._data_dir, self.__CACHE_FILENAME) - self._load_cache() + if validator: # patronictl uses validator=None and we don't want to load anything from local cache in this case + self._load_cache() self._cache_needs_saving = False @property @@ -341,8 +342,8 @@ class Config(object): if ConfigHandler.CMDLINE_OPTIONS[name][1](value): pg_params[name] = value else: - logging.warning("postgresql parameter %s=%s failed validation, defaulting to %s", - name, value, ConfigHandler.CMDLINE_OPTIONS[name][0]) + logger.warning("postgresql parameter %s=%s failed validation, defaulting to %s", + name, value, ConfigHandler.CMDLINE_OPTIONS[name][0]) return pg_params