jandieman
/
searxng
mirror of https://github.com/searxng/searxng.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2349 from dalf/fix-settings-loader 

[fix] settings_loader: don't crash when a key exists only in the user settings
This commit is contained in:
Alexandre Flament 2020-12-03 11:47:53 +01:00 committed by GitHub
parent 89fbb85d45 d0d7a3e1c2
commit 7905d41487
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
searx/settings_loader.py
View File

@ -57,7 +57,10 @@ def update_settings(default_settings, user_settings):
# merge everything except the engines # merge everything except the engines
for k, v in user_settings.items(): for k, v in user_settings.items():
if k not in ('use_default_settings', 'engines'): if k not in ('use_default_settings', 'engines'):
if k in default_settings:
update_dict(default_settings[k], v) update_dict(default_settings[k], v)
else:
default_settings[k] = v
# parse the engines # parse the engines
remove_engines = None remove_engines = None

3
tests/unit/settings/user_settings_simple.yml
View File

@ -4,3 +4,6 @@ server:
bind_address: "0.0.0.0" bind_address: "0.0.0.0"
default_http_headers: default_http_headers:
Custom-Header: Custom-Value Custom-Header: Custom-Value
result_proxy:
url : https://localhost/morty
key : "$ecretKey"