From 09828ff2d9f64b326efbfda0d84d5e461bc672cf Mon Sep 17 00:00:00 2001 From: Marcelo Glezer Date: Sun, 1 Mar 2015 22:19:32 -0300 Subject: changes requested by @mhils --- libmproxy/console/common.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'libmproxy/console/common.py') diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index 8f074cfd..fa21c93e 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -162,7 +162,6 @@ def raw_format_flow(f, focus, extended, padding): if f["resp_ctype"]: resp.append(fcol(f["resp_ctype"], rc)) resp.append(fcol(f["resp_clen"], rc)) - resp.append(fcol(f["resp_rate"], rc)) resp.append(fcol(f["roundtrip"], rc)) elif f["err_msg"]: @@ -347,21 +346,15 @@ def format_flow(f, focus, extended=False, hostheader=False, padding=2): else: contentdesc = "[no content]" duration = 0 - if f.response.timestamp_end: - delta = f.response.timestamp_end - f.response.timestamp_start - if f.request.timestamp_end: - duration = f.response.timestamp_end - f.request.timestamp_end - else: - delta = 0 + if f.response.timestamp_end and f.request.timestamp_start: + duration = f.response.timestamp_end - f.request.timestamp_start size = f.response.size() - rate = utils.pretty_size(size / ( delta if delta > 0 else 1 ) ) roundtrip = utils.pretty_duration(duration) d.update(dict( resp_code = f.response.code, resp_is_replay = f.response.is_replay, resp_clen = contentdesc, - resp_rate = "{0}/s".format(rate), roundtrip = roundtrip, )) t = f.response.headers["content-type"] -- cgit v1.2.3