diff --git a/pywb/warcserver/index/indexsource.py b/pywb/warcserver/index/indexsource.py index 64618443..b1b712d6 100644 --- a/pywb/warcserver/index/indexsource.py +++ b/pywb/warcserver/index/indexsource.py @@ -23,7 +23,7 @@ import logging class BaseIndexSource(object): WAYBACK_ORIG_SUFFIX = '{timestamp}id_/{url}' - logger = logging.getLogger(__name__) + logger = logging.getLogger('warcserver') def load_index(self, params): #pragma: no cover raise NotImplemented() @@ -522,7 +522,7 @@ class WBMementoIndexSource(MementoIndexSource): def handle_timegate(self, params, timestamp): url = params['url'] - load_url = self._get_replay_url(timestamp, url) + load_url = self.timegate_url.format(url=url, timestamp=ts) try: headers = self._get_headers(params) diff --git a/pywb/warcserver/resource/responseloader.py b/pywb/warcserver/resource/responseloader.py index a398997b..63725c0e 100644 --- a/pywb/warcserver/resource/responseloader.py +++ b/pywb/warcserver/resource/responseloader.py @@ -26,12 +26,15 @@ import itertools import json import glob import datetime +import logging from requests.models import PreparedRequest import six.moves.http_client six.moves.http_client._MAXHEADERS = 10000 +logger = logging.getLogger('warcserver') + #============================================================================= class BaseLoader(object): @@ -449,8 +452,7 @@ class LiveWebLoader(BaseLoader): return upstream_res except Exception as e: - print('FAILED: ' + method + ' ' + load_url, e) - print(req_headers) + logger.debug('FAILED: ' + method + ' ' + load_url + ': ' + str(e)) raise LiveResourceException(load_url) def __str__(self):