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

config: move config files to ./configs/

Browse Source 
PYWB_CONFIG_FILE setting overrides passed in config
This commit is contained in:
Ilya Kreymer 2014-03-27 14:31:27 -07:00
parent b5e70f5dc6
commit 093d8310e5
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pywb/cdx/config.yaml → configs/cdx-server-config.yaml
View File

0
config.yaml → configs/config.yaml
View File

2
pywb/apps/cdx_server.py
View File

@ -7,7 +7,7 @@ from pywb.core.cdx_api_handler import create_cdx_server_app
#================================================================= #=================================================================
# cdx-server only config # cdx-server only config
DEFAULT_CONFIG = 'pywb/cdx/config.yaml' DEFAULT_CONFIG = 'configs/cdx-server-config.yaml'
application = init_app(create_cdx_server_app, application = init_app(create_cdx_server_app,
load_yaml=True, load_yaml=True,

9
pywb/framework/wsgi_wrappers.py
View File

@ -106,7 +106,7 @@ def handle_exception(env, wb_router, exc, print_trace):
status=status) status=status)
#================================================================= #=================================================================
DEFAULT_CONFIG_FILE = 'config.yaml' DEFAULT_CONFIG_FILE = 'configs/config.yaml'
#================================================================= #=================================================================
@ -116,8 +116,11 @@ def init_app(init_func, load_yaml=True, config_file=None):
logging.debug('') logging.debug('')
if load_yaml: if load_yaml:
if not config_file: # env setting overrides all others
config_file = os.environ.get('PYWB_CONFIG_FILE') env_config = os.environ.get('PYWB_CONFIG_FILE')
if env_config:
config_file = env_config
if not config_file: if not config_file:
config_file = DEFAULT_CONFIG_FILE config_file = DEFAULT_CONFIG_FILE

2
pywb/warc/resolvingloader.py
View File

@ -31,7 +31,7 @@ class ResolvingLoader:
# two index lookups # two index lookups
# Case 1: if mimetype is still warc/revisit # Case 1: if mimetype is still warc/revisit
if cdx['mimetype'] == 'warc/revisit' and headers_record: if cdx.get('mimetype') == 'warc/revisit' and headers_record:
payload_record = self._load_different_url_payload(cdx, payload_record = self._load_different_url_payload(cdx,
headers_record, headers_record,
failed_files, failed_files,