backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-15 00:03:28 +01:00
Code Issues Projects Releases Activity

proxy mode: respect settings when started from cli (#557)

Browse Source
This commit is contained in:
micronn 2020-05-01 07:38:13 +02:00 committed by GitHub
parent be90e06742
commit 871a05a76a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pywb/warcserver/warcserver.py
View File

@ -54,6 +54,8 @@ class WarcServer(BaseWarcServer):
if custom_config: if custom_config:
if 'collections' in custom_config and 'collections' in config: if 'collections' in custom_config and 'collections' in config:
custom_config['collections'].update(config['collections']) custom_config['collections'].update(config['collections'])
if 'proxy' in custom_config and 'proxy' in config:
custom_config['proxy'].update(config['proxy'])
config.update(custom_config) config.update(custom_config)
super(WarcServer, self).__init__(debug=config.get('debug', False)) super(WarcServer, self).__init__(debug=config.get('debug', False))