Skip to content

Commit 8f8b665

Browse files
committed
log request summary at INFO level
1 parent e4b509b commit 8f8b665

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

microhttp.py

+7-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import time
88
from asyncio import coroutine, Task, start_server
99

10-
log = logging.getLogger(__name__)
10+
log = logging.getLogger('microhttp')
1111

1212
class HTTPException(Exception):
1313
def __init__(self, status_code, msg):
@@ -85,7 +85,8 @@ def end(self):
8585
dur = time.time() - self.start_time
8686
Request.TOTAL_REQ += 1
8787
Request.TOTAL_TIME += dur
88-
log.debug('served request for %s in %s', self.full_path, dur)
88+
log.info('%s %s %s %sms', self.status_code, self.method,
89+
self.full_path, round(dur*1000, 2))
8990
log.debug('avg req time %0.6f for %d requests',
9091
Request.TOTAL_TIME / Request.TOTAL_REQ, Request.TOTAL_REQ)
9192

@@ -99,6 +100,7 @@ def __init__(self, writer, request, server):
99100
self.is_sent = False
100101
self.is_head_request = False
101102
self.headers_sent = False
103+
self.status_code = -1
102104

103105
@coroutine
104106
def send_headers(self, length=0, status=200, headers={}):
@@ -111,6 +113,7 @@ def send_headers(self, length=0, status=200, headers={}):
111113
#yield from self.writer.drain()
112114
log.debug('headers written')
113115
self.headers_sent = True
116+
self.request.status_code = status
114117

115118
@coroutine
116119
def send(self, d):
@@ -216,7 +219,7 @@ def f(req, res):
216219

217220
if meth.lower() == method.lower():
218221
cb = cb_wrapper(callback, cb_kwargs)
219-
elif meth.lower() == 'head' and method.lower() == 'get':
222+
elif meth.lower() == 'head':
220223
cb = cb_wrapper(callback, cb_kwargs, is_head=True)
221224
if cb:
222225
break # we matched one
@@ -231,7 +234,7 @@ def handle(self, reader, writer, reused=False):
231234
log.debug('client disconnect')
232235
writer.close()
233236
return
234-
log.debug('NEW REQUEST %s', 'reused' if reused else '')
237+
log.debug('NEW REQUEST %s', '(reused connection)' if reused else '')
235238
response = Response(writer, request, self)
236239

237240
cb = self.select_callback(request.path, request.method)

0 commit comments

Comments
 (0)