p34709852
/
monkey
forked from p15670423/monkey
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Added more logging to HTTP server

This commit is contained in:
daniel goldberg 2016-08-29 12:05:24 +03:00
parent 57525b6450
commit 3b39ee4308
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
chaos_monkey/transport/http.py
View File

@ -19,7 +19,7 @@ class FileServHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
return "Microsoft-IIS/7.5." return "Microsoft-IIS/7.5."
@staticmethod @staticmethod
def report_download(): def report_download(dest=None):
pass pass
def do_POST(self): def do_POST(self):
@ -44,7 +44,7 @@ class FileServHTTPRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
start_range += chunk start_range += chunk
if f.tell() == monkeyfs.getsize(self.filename): if f.tell() == monkeyfs.getsize(self.filename):
self.report_download() self.report_download(self.client_address)
f.close() f.close()
@ -147,18 +147,6 @@ class HTTPConnectProxyHandler(BaseHTTPServer.BaseHTTPRequestHandler):
(self.address_string(), self.log_date_time_string(), format % args)) (self.address_string(), self.log_date_time_string(), format % args))
class InternalHTTPServer(BaseHTTPServer.HTTPServer):
def handle_error(self, request, client_address):
#ToDo: debug log error
# import sys
# import traceback
# print >>sys.stderr, '-'*40
# print >>sys.stderr, 'Exception happened during processing of request from', client_address
# traceback.print_exc()
# print >>sys.stderr, '-'*40
pass
class HTTPServer(threading.Thread): class HTTPServer(threading.Thread):
def __init__(self, local_ip, local_port, filename, max_downloads=1): def __init__(self, local_ip, local_port, filename, max_downloads=1):
self._local_ip = local_ip self._local_ip = local_ip
@ -174,11 +162,12 @@ class HTTPServer(threading.Thread):
filename = self._filename filename = self._filename
@staticmethod @staticmethod
def report_download(): def report_download(dest=None):
LOG.info('File downloaded from (%s,%s)' % (dest[0],dest[1]))
self.downloads += 1 self.downloads += 1
httpd = InternalHTTPServer((self._local_ip, self._local_port), TempHandler) httpd = BaseHTTPServer.HTTPServer((self._local_ip, self._local_port), TempHandler)
httpd.timeout = 0.5 httpd.timeout = 0.5 # this is irrelevant?
while not self._stopped and self.downloads < self.max_downloads: while not self._stopped and self.downloads < self.max_downloads:
httpd.handle_request() httpd.handle_request()
@ -192,7 +181,7 @@ class HTTPServer(threading.Thread):
class HTTPConnectProxy(TransportProxyBase): class HTTPConnectProxy(TransportProxyBase):
def run(self): def run(self):
httpd = InternalHTTPServer((self.local_host, self.local_port), HTTPConnectProxyHandler) httpd = BaseHTTPServer.HTTPServer((self.local_host, self.local_port), HTTPConnectProxyHandler)
httpd.timeout = 30 httpd.timeout = 30
while not self._stopped: while not self._stopped:
httpd.handle_request() httpd.handle_request()