backup/pywb
1
0
Fork 0
mirror of https://github.com/webrecorder/pywb.git synced 2025-03-25 23:47:47 +01:00
Code Issues Projects Releases Activity

don't mask raised exceptions, to address #23

Browse Source
This commit is contained in:
Ilya Kreymer 2014-02-05 13:21:57 -08:00
parent 1a1aa814d0
commit d347b4952b
3 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pywb/archivalrouter.py
View File

@ -164,7 +164,6 @@ class ReferRedirect:
if not any (wbrequest.referrer.startswith(i) for i in self.match_prefixs): if not any (wbrequest.referrer.startswith(i) for i in self.match_prefixs):
return None return None
try:
ref_split = urlparse.urlsplit(wbrequest.referrer) ref_split = urlparse.urlsplit(wbrequest.referrer)
path = ref_split.path path = ref_split.path
@ -190,9 +189,6 @@ class ReferRedirect:
#final_url = urlparse.urlunsplit((ref_split.scheme, ref_split.netloc, ref_path[0] + str(ref_wb_url), '', '')) #final_url = urlparse.urlunsplit((ref_split.scheme, ref_split.netloc, ref_path[0] + str(ref_wb_url), '', ''))
final_url = urlparse.urlunsplit((ref_split.scheme, ref_split.netloc, rewriter.rewrite(rel_request_uri), '', '')) final_url = urlparse.urlunsplit((ref_split.scheme, ref_split.netloc, rewriter.rewrite(rel_request_uri), '', ''))
except Exception as e:
raise e
return WbResponse.redir_response(final_url) return WbResponse.redir_response(final_url)

2
pywb/indexreader.py
View File

@ -195,7 +195,7 @@ class RemoteCDXServer(IndexReader):
msg = 'Blocked By Robots' if 'Blocked By Robots' in exc_msg else 'Excluded' msg = 'Blocked By Robots' if 'Blocked By Robots' in exc_msg else 'Excluded'
raise wbexceptions.AccessException(msg) raise wbexceptions.AccessException(msg)
else: else:
raise e raise
if parsed_cdx: if parsed_cdx:
return (CDXCaptureResult(cdx) for cdx in response) return (CDXCaptureResult(cdx) for cdx in response)

4
pywb/wbapp.py
View File

@ -89,9 +89,9 @@ def main():
logging.info('*** pywb inited with settings from {0}.pywb_config()!\n'.format(config_name)) logging.info('*** pywb inited with settings from {0}.pywb_config()!\n'.format(config_name))
return app return app
except Exception as e: except Exception:
logging.exception('*** pywb could not init with settings from {0}.pywb_config()!\n'.format(config_name)) logging.exception('*** pywb could not init with settings from {0}.pywb_config()!\n'.format(config_name))
raise e raise
#================================================================= #=================================================================
if __name__ == "__main__" or utils.enable_doctests(): if __name__ == "__main__" or utils.enable_doctests():