diff options
| author | Marcelo Glezer <mg@tekii.com.ar> | 2015-03-02 14:37:30 -0300 |
|---|---|---|
| committer | Marcelo Glezer <mg@tekii.com.ar> | 2015-03-02 14:37:30 -0300 |
| commit | 8008a4336d85f4d34bd9f192c5f3e510f4adf5cd (patch) | |
| tree | 02240bbd5a5abcff275e2d841252c1b86a32f6eb /libmproxy/console | |
| parent | bd6c3f64c1f3102a4e91d4a964757821773781e0 (diff) | |
| parent | e65a8659f00fb949d15f9af9fefd72df48abe9af (diff) | |
| download | mitmproxy-8008a4336d85f4d34bd9f192c5f3e510f4adf5cd.tar.gz mitmproxy-8008a4336d85f4d34bd9f192c5f3e510f4adf5cd.tar.bz2 mitmproxy-8008a4336d85f4d34bd9f192c5f3e510f4adf5cd.zip | |
Merge pull request #2 from mitmproxy/master
update to mitmproxy/master
Diffstat (limited to 'libmproxy/console')
| -rw-r--r-- | libmproxy/console/common.py | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libmproxy/console/common.py b/libmproxy/console/common.py index a2cfd57b..fa21c93e 100644 --- a/libmproxy/console/common.py +++ b/libmproxy/console/common.py @@ -162,7 +162,7 @@ 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"]: resp.append(fcol(SYMBOL_RETURN, "error")) @@ -345,19 +345,17 @@ def format_flow(f, focus, extended=False, hostheader=False, padding=2): contentdesc = "[content missing]" else: contentdesc = "[no content]" - - if f.response.timestamp_end: - delta = f.response.timestamp_end - f.response.timestamp_start - else: - delta = 0 + duration = 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"] if t: |