mirror of
https://github.com/webrecorder/pywb.git
synced 2025-03-15 08:04:49 +01:00
webagg: store original 'source' value in cdx for properly mapping in WARC file resolver
error handling: ensure 'last_exc' is a string
This commit is contained in:
parent
4c7da0f6ef
commit
c1d7111841
@ -74,6 +74,8 @@ class ResAggApp(object):
|
||||
res = self.json_encode(res, out_headers)
|
||||
|
||||
if errs:
|
||||
if 'last_exc' in errs:
|
||||
errs['last_exc'] = str(errs['last_exc'])
|
||||
out_headers['ResErrors'] = json.dumps(errs)
|
||||
|
||||
start_response('200 OK', list(out_headers.items()))
|
||||
|
@ -187,7 +187,8 @@ class WARCPathLoader(BaseLoader):
|
||||
if not cdx.get('filename') or cdx.get('offset') is None:
|
||||
return None
|
||||
|
||||
cdx._formatter = ParamFormatter(params, cdx.get('source'))
|
||||
orig_source = cdx.get('source', '').split(':')[0]
|
||||
cdx._formatter = ParamFormatter(params, orig_source)
|
||||
|
||||
failed_files = []
|
||||
headers, payload = (self.resolve_loader.
|
||||
|
Loading…
x
Reference in New Issue
Block a user