From 08796d9dafe3ea38da1c442abfc849e3529af74a Mon Sep 17 00:00:00 2001
From: Joakim Hamren <joakim.hamren@gmail.com>
Date: Fri, 12 Jul 2013 08:01:43 +0200
Subject: [PATCH] Added method and name for failures

---
 locust/stats.py             | 68 +++++++++++++++++++++++++++++--------
 locust/templates/index.html |  8 +++--
 locust/web.py               |  2 +-
 3 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/locust/stats.py b/locust/stats.py
index 9fb46a5f69..f0c67a60fe 100644
--- a/locust/stats.py
+++ b/locust/stats.py
@@ -1,5 +1,6 @@
 import time
 import gevent
+import hashlib
 from copy import copy
 
 import events
@@ -138,12 +139,6 @@ def log(self, response_time, content_length):
 
         # increase total content-length
         self.total_content_length += content_length
-    
-    def log_error(self, error):
-        self.num_failures += 1
-        key = "%r: %s" % (error, repr(str(error)))
-        self.stats.errors.setdefault(key, 0)
-        self.stats.errors[key] += 1
 
     def _log_time_of_request(self):
         t = int(time.time())
@@ -178,10 +173,14 @@ def _log_response_time(self, response_time):
 
     def log_error(self, error):
         self.num_failures += 1
-        key = "%r: %s" % (error, repr(str(error)))
-        self.stats.errors.setdefault(key, 0)
-        self.stats.errors[key] += 1
-    
+        key = StatsError.create_key(self.method, self.name, error)
+        entry = self.stats.errors.get(key)
+        if not entry:
+            entry = StatsError(self.method, self.name, error)
+            self.stats.errors[key] = entry
+
+        entry.occured()
+
     @property
     def fail_ratio(self):
         try:
@@ -353,6 +352,42 @@ def percentile(self, tpl=" %-" + str(STATS_NAME_WIDTH) + "s %8d %6d %6d %6d %6d
             self.max_response_time
         )
 
+class StatsError(object):
+    def __init__(self, method, name, error, occurences=0):
+        self.method = method
+        self.name = name
+        self.error = error
+        self.occurences = occurences
+
+    @classmethod
+    def create_key(cls, method, name, error):
+        key = "%s.%s.%r" % (method, name, error)
+        return hashlib.md5(key).hexdigest()
+
+    def occured(self):
+        self.occurences += 1
+
+    def to_name(self):
+        return "%s %s: %r" % (self.method, 
+            self.name, repr(self.error))
+
+    def to_dict(self):
+        return {
+            "method": self.method,
+            "name": self.name,
+            "error": repr(self.error),
+            "occurences": self.occurences
+        }
+
+    @classmethod
+    def from_dict(cls, data):
+        return cls(
+            data["method"], 
+            data["name"], 
+            data["error"], 
+            data["occurences"]
+        )
+
 
 def avg(values):
     return sum(values, 0.0) / max(len(values), 1)
@@ -385,7 +420,7 @@ def on_request_failure(method, name, response_time, error, response=None):
 
 def on_report_to_master(client_id, data):
     data["stats"] = [global_stats.entries[key].get_stripped_report() for key in global_stats.entries.iterkeys() if not (global_stats.entries[key].num_requests == 0 and global_stats.entries[key].num_failures == 0)]
-    data["errors"] =  global_stats.errors
+    data["errors"] =  dict([(k, e.to_dict()) for k, e in global_stats.errors.iteritems()])
     global_stats.errors = {}
 
 def on_slave_report(client_id, data):
@@ -397,8 +432,11 @@ def on_slave_report(client_id, data):
         global_stats.entries[request_key].extend(entry, full_request_history=True)
         global_stats.last_request_timestamp = max(global_stats.last_request_timestamp, entry.last_request_timestamp)
 
-    for err_message, err_count in data["errors"].iteritems():
-        global_stats.errors[err_message] = global_stats.errors.setdefault(err_message, 0) + err_count
+    for error_key, error in data["errors"].iteritems():
+        if error_key not in global_stats.errors:
+            global_stats.errors[error_key] = StatsError.from_dict(error)
+        else:
+            global_stats.errors[error_key].occurences += error["occurences"]
 
 events.request_success += on_request_success
 events.request_failure += on_request_failure
@@ -447,8 +485,8 @@ def print_error_report():
     console_logger.info("Error report")
     console_logger.info(" %-18s %-100s" % ("# occurences", "Error"))
     console_logger.info("-" * (80 + STATS_NAME_WIDTH))
-    for error, count in global_stats.errors.iteritems():
-        console_logger.info(" %-18i %-100s" % (count, error))
+    for error in global_stats.errors.itervalues():
+        console_logger.info(" %-18i %-100s" % (error.occurences, error.to_name()))
     console_logger.info("-" * (80 + STATS_NAME_WIDTH))
     console_logger.info("")
 
diff --git a/locust/templates/index.html b/locust/templates/index.html
index 584a5bad99..8264e1d23e 100644
--- a/locust/templates/index.html
+++ b/locust/templates/index.html
@@ -165,6 +165,8 @@ <h2>Ramping</h2>
                     <table id="errors" class="stats">
                         <thead>
                             <th class="error_count stats_label" data-sortkey="1"># fails</th>
+                            <th class="stats_label" href="#" data-sortkey="method">Method</th>
+                            <th class="stats_label" href="#" data-sortkey="name">Name</th>
                             <th class="error_type stats_label" data-sortkey="0">Type</th>
                         </thead>
                         <tbody>
@@ -241,8 +243,10 @@ <h1>Version</h1>
     <script type="text/x-jqote-template" id="errors-template">
         <![CDATA[
         <tr class="<%=(alternate ? "dark" : "")%>">
-            <td><%= this[1] %></td>
-            <td><%= function(e) { return e.replace("<", "&lt;"); }(this[0]) %></td>
+            <td><%= this.occurences %></td>
+            <td><%= this.method %></td>
+            <td><%= this.name %></td>
+            <td><%= function(e) { return e.replace("<", "&lt;"); }(this.error) %></td>
         </tr>
         <% alternate = !alternate; %>
         ]]>
diff --git a/locust/web.py b/locust/web.py
index 4823f33e88..0de930731c 100644
--- a/locust/web.py
+++ b/locust/web.py
@@ -174,7 +174,7 @@ def request_stats():
                 "avg_content_length": s.avg_content_length,
             })
         
-        report = {"stats":stats, "errors":list(runners.locust_runner.errors.iteritems())}
+        report = {"stats":stats, "errors":[e.to_dict() for e in runners.locust_runner.errors.itervalues()]}
         if stats:
             report["total_rps"] = stats[len(stats)-1]["current_rps"]
             report["fail_ratio"] = runners.locust_runner.stats.aggregated_stats("Total").fail_ratio