From 093d8310e5b21a0425573717d2464fe5a5760f8a Mon Sep 17 00:00:00 2001 From: Ilya Kreymer Date: Thu, 27 Mar 2014 14:31:27 -0700 Subject: [PATCH] config: move config files to ./configs/ PYWB_CONFIG_FILE setting overrides passed in config --- pywb/cdx/config.yaml => configs/cdx-server-config.yaml | 0 config.yaml => configs/config.yaml | 0 pywb/apps/cdx_server.py | 2 +- pywb/framework/wsgi_wrappers.py | 9 ++++++--- pywb/warc/resolvingloader.py | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) rename pywb/cdx/config.yaml => configs/cdx-server-config.yaml (100%) rename config.yaml => configs/config.yaml (100%) diff --git a/pywb/cdx/config.yaml b/configs/cdx-server-config.yaml similarity index 100% rename from pywb/cdx/config.yaml rename to configs/cdx-server-config.yaml diff --git a/config.yaml b/configs/config.yaml similarity index 100% rename from config.yaml rename to configs/config.yaml diff --git a/pywb/apps/cdx_server.py b/pywb/apps/cdx_server.py index c9b85994..d97ca4e5 100644 --- a/pywb/apps/cdx_server.py +++ b/pywb/apps/cdx_server.py @@ -7,7 +7,7 @@ from pywb.core.cdx_api_handler import create_cdx_server_app #================================================================= # cdx-server only config -DEFAULT_CONFIG = 'pywb/cdx/config.yaml' +DEFAULT_CONFIG = 'configs/cdx-server-config.yaml' application = init_app(create_cdx_server_app, load_yaml=True, diff --git a/pywb/framework/wsgi_wrappers.py b/pywb/framework/wsgi_wrappers.py index 4fe42727..9ea45895 100644 --- a/pywb/framework/wsgi_wrappers.py +++ b/pywb/framework/wsgi_wrappers.py @@ -106,7 +106,7 @@ def handle_exception(env, wb_router, exc, print_trace): 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('') if load_yaml: - if not config_file: - config_file = os.environ.get('PYWB_CONFIG_FILE') + # env setting overrides all others + env_config = os.environ.get('PYWB_CONFIG_FILE') + if env_config: + config_file = env_config + if not config_file: config_file = DEFAULT_CONFIG_FILE diff --git a/pywb/warc/resolvingloader.py b/pywb/warc/resolvingloader.py index 59d14b52..8c2a72d8 100644 --- a/pywb/warc/resolvingloader.py +++ b/pywb/warc/resolvingloader.py @@ -31,7 +31,7 @@ class ResolvingLoader: # two index lookups # 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, headers_record, failed_files,