backup/warcprox
1
0
Fork 0
mirror of https://github.com/internetarchive/warcprox.git synced 2025-01-18 13:22:09 +01:00
Code Issues Projects Releases Activity

logging tweaks

Browse Source
This commit is contained in:
Noah Levitt 2013-11-01 19:42:37 -07:00
parent b07118159e
commit 41b1db79e5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
warcprox.py
View File

@ -333,8 +333,8 @@ class MitmProxyHandler(BaseHTTPServer.BaseHTTPRequestHandler):
self.log_date_time_string(), fmt % args)) self.log_date_time_string(), fmt % args))
def log_message(self, fmt, *args): def log_message(self, fmt, *args):
logging.info("{0} - - [{1}] {2}".format(self.address_string(), logging.info("{} {} - - [{}] {}".format(self.__class__.__name__,
self.log_date_time_string(), fmt % args)) self.address_string(), self.log_date_time_string(), fmt % args))
class WarcProxyHandler(MitmProxyHandler): class WarcProxyHandler(MitmProxyHandler):
@ -418,15 +418,15 @@ class PlaybackProxyHandler(MitmProxyHandler):
pass pass
def _proxy_request(self): def _proxy_request(self):
logging.info('PlaybackProxyHandler handling request for {}'.format(self.url))
date, location = self.server.playback_index_db.lookup_latest(self.url) date, location = self.server.playback_index_db.lookup_latest(self.url)
logging.info('lookup_latest returned {}:{}'.format(date, location)) logging.debug('lookup_latest returned {}:{}'.format(date, location))
status = None
if location is not None: if location is not None:
try: try:
response = self.gather_response(location['f'], location['o']) response = self.gather_response(location['f'], location['o'])
except: except:
status = 500
logging.error('PlaybackProxyHandler problem playing back {}'.format(self.url), exc_info=1) logging.error('PlaybackProxyHandler problem playing back {}'.format(self.url), exc_info=1)
payload = '500 Warcprox Error\n\n{}\n'.format(traceback.format_exc()) payload = '500 Warcprox Error\n\n{}\n'.format(traceback.format_exc())
response = ('HTTP/1.1 500 Internal Server Error\r\n' response = ('HTTP/1.1 500 Internal Server Error\r\n'
@ -435,6 +435,7 @@ class PlaybackProxyHandler(MitmProxyHandler):
+ '\r\n' + '\r\n'
+ '{}').format(len(payload), payload) + '{}').format(len(payload), payload)
else: else:
status = 404
response = ('HTTP/1.1 404 Not Found\r\n' response = ('HTTP/1.1 404 Not Found\r\n'
+ 'Content-Type: text/plain\r\n' + 'Content-Type: text/plain\r\n'
+ 'Content-Length: 19\r\n' + 'Content-Length: 19\r\n'
@ -443,6 +444,8 @@ class PlaybackProxyHandler(MitmProxyHandler):
self.connection.sendall(response) self.connection.sendall(response)
self.log_request(status, len(response))
def open_warc_at_offset(self, warcfilename, offset): def open_warc_at_offset(self, warcfilename, offset):
logging.debug('opening {} at offset {}'.format(warcfilename, offset)) logging.debug('opening {} at offset {}'.format(warcfilename, offset))