mirror of
https://github.com/webrecorder/pywb.git
synced 2025-03-15 08:04:49 +01:00
warcserver: logging: use 'warcserver' logger for index and response load errors
wbmementoindexsource: use timegate_url for initial head query to allow for different urls (proxy, etc..)
This commit is contained in:
parent
41b3789412
commit
36abd032ce
@ -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)
|
||||
|
@ -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):
|
||||
|
Loading…
x
Reference in New Issue
Block a user