aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/console/common.py
diff options
context:
space:
mode:
authorMarcelo Glezer <marcelo.glezer@gmail.com>2015-03-01 22:19:32 -0300
committerMarcelo Glezer <marcelo.glezer@gmail.com>2015-03-01 22:19:32 -0300
commit09828ff2d9f64b326efbfda0d84d5e461bc672cf (patch)
tree4d16d071b2993f3d042fd4b03d14a3a75c43bfa0 /libmproxy/console/common.py
parent3a78c95d0a202b486d062951ee0593f43a16eac2 (diff)
downloadmitmproxy-09828ff2d9f64b326efbfda0d84d5e461bc672cf.tar.gz
mitmproxy-09828ff2d9f64b326efbfda0d84d5e461bc672cf.tar.bz2
mitmproxy-09828ff2d9f64b326efbfda0d84d5e461bc672cf.zip
changes requested by @mhils
Diffstat (limited to 'libmproxy/console/common.py')
-rw-r--r--libmproxy/console/common.py11
1 files changed, 2 insertions, 9 deletions
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"]