diff options
| -rw-r--r-- | scripts/logreport.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/logreport.py b/scripts/logreport.py index 5fc1cef..b8a854b 100644 --- a/scripts/logreport.py +++ b/scripts/logreport.py @@ -98,8 +98,7 @@ def build_js_array(pairs, max_val=None): s_list = [] for ts, val in pairs: unix_time = calendar.timegm(ts.timetuple()) * 1000 - # Use max-val to ensure that - maxed_val = max(max_val, val) if max_val else val + maxed_val = min(max_val, val) if max_val else val s_list.append('[%s, %s]' % (unix_time, maxed_val)) return '[%s]' % ','.join(s_list) @@ -130,7 +129,7 @@ def summarize_window(ts, window, slow_threshold): 'reqs': reqs, 'dumps': dumps, 'images': images, - 'tags': tags, +a 'tags': tags, 'chat_users': chat_users, 'slow': slow, 'mean_resp': mean(times), @@ -248,7 +247,7 @@ class DumpReport(object): def _output_usage_charts(self, writer): writer.section('Activity Rates') writer.graph('Reqs/sec', 'reqs_per_sec', - build_js_array((r['ts'], r['images'] / self.interval.seconds) for r in self.windows)) + build_js_array((r['ts'], r['reqs'] / self.interval.seconds) for r in self.windows)) writer.graph('Images/sec', 'images_per_sec', build_js_array((r['ts'], r['images'] / self.interval.seconds) for r in self.windows)) writer.graph('Dumps/sec', 'dumps_per_sec', |