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

warcserver: logging: use 'warcserver' logger for index and response load errors

Browse Source 
wbmementoindexsource: use timegate_url for initial head query to allow for different urls (proxy, etc..)
This commit is contained in:
Ilya Kreymer 2017-07-03 23:25:25 -07:00
parent 41b3789412
commit 36abd032ce
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pywb/warcserver/index/indexsource.py
View File

@ -23,7 +23,7 @@ import logging
class BaseIndexSource(object): class BaseIndexSource(object):
WAYBACK_ORIG_SUFFIX = '{timestamp}id_/{url}' WAYBACK_ORIG_SUFFIX = '{timestamp}id_/{url}'
logger = logging.getLogger(__name__) logger = logging.getLogger('warcserver')
def load_index(self, params): #pragma: no cover def load_index(self, params): #pragma: no cover
raise NotImplemented() raise NotImplemented()
@ -522,7 +522,7 @@ class WBMementoIndexSource(MementoIndexSource):
def handle_timegate(self, params, timestamp): def handle_timegate(self, params, timestamp):
url = params['url'] url = params['url']
load_url = self._get_replay_url(timestamp, url) load_url = self.timegate_url.format(url=url, timestamp=ts)
try: try:
headers = self._get_headers(params) headers = self._get_headers(params)

6
pywb/warcserver/resource/responseloader.py
View File

@ -26,12 +26,15 @@ import itertools
import json import json
import glob import glob
import datetime import datetime
import logging
from requests.models import PreparedRequest from requests.models import PreparedRequest
import six.moves.http_client import six.moves.http_client
six.moves.http_client._MAXHEADERS = 10000 six.moves.http_client._MAXHEADERS = 10000
logger = logging.getLogger('warcserver')
#============================================================================= #=============================================================================
class BaseLoader(object): class BaseLoader(object):
@ -449,8 +452,7 @@ class LiveWebLoader(BaseLoader):
return upstream_res return upstream_res
except Exception as e: except Exception as e:
print('FAILED: ' + method + ' ' + load_url, e) logger.debug('FAILED: ' + method + ' ' + load_url + ': ' + str(e))
print(req_headers)
raise LiveResourceException(load_url) raise LiveResourceException(load_url)
def __str__(self): def __str__(self):