on master help sign in
Merge pull request #2349 from dalf/fix-settings-loader

[fix] settings_loader: don't crash when a key exists only in the user settings

commit7905d4148718816de60cafff8a05ce95f97ce6aa authorAlexandre Flament <alex@al-f.net> dateThu 3 Dec 2020, 11:47 (6 years ago) parent89fbb85d0d7a3e
2 files changed+7−1
searx/settings_loader.py+4−1 tests/unit/settings/user_settings_simple.yml+3
searx/settings_loader.py+4−1
@@ -57,7 +57,10 @@ def update_settings(default_settings, user_settings):
5757 # merge everything except the engines
5858 for k, v in user_settings.items():
5959 if k not in ('use_default_settings', 'engines'):
60− update_dict(default_settings[k], v)
60+ if k in default_settings:
61+ update_dict(default_settings[k], v)
62+ else:
63+ default_settings[k] = v
6164
6265 # parse the engines
6366 remove_engines = None
tests/unit/settings/user_settings_simple.yml+3
@@ -4,3 +4,6 @@ server:
44 bind_address: "0.0.0.0"
55 default_http_headers:
66 Custom-Header: Custom-Value
7+result_proxy:
8+ url : https://localhost/morty
9+ key : "$ecretKey"