Trivial output tweaks.

edwardt · Jan 24, 2011 · 509904a · 509904a
2 parents fdbefb6 + 615d90b
commit 509904a
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/bin/swift-account-audit b/bin/swift-account-audit
@@ -238,14 +238,13 @@ class Auditor(object):
                     if resp.status // 100 != 2:
                         self.account_not_found += 1
                         consistent = False
-                        print "  Bad status GETting account %(ip)s:%(device)s" \
-                                    % node
+                        print "  Bad status GETting account '%s' from %ss:%ss" % (account, node['ip'], node['device'])
                         break
                     results = simplejson.loads(resp.read())
                 except Exception:
                     self.account_exceptions += 1
                     consistent = False
-                    print "  Exception GETting account %(ip)s:%(device)s" % node
+                    print "  Exception GETting account '%s' on %ss:%ss" % (account, node['ip'], node['device'])
                     break
                 if node_id not in responses:
                     responses[node_id] = [dict(resp.getheaders()), []]
@@ -258,15 +257,15 @@ class Auditor(object):
         if len(set(cont_counts)) != 1:
             self.account_container_mismatch += 1
             consistent = False
-            print "  Account databases don't agree on number of containers."
+            print "  Account databases for '%s' don't agree on number of containers." % account
             if cont_counts:
                 print "  Max: %s, Min: %s" % (max(cont_counts), min(cont_counts))
         obj_counts = [int(header['x-account-object-count'])
                              for header in headers]
         if len(set(obj_counts)) != 1:
             self.account_object_mismatch += 1
             consistent = False
-            print "  Account databases don't agree on number of objects."
+            print "  Account databases for '%s' don't agree on number of objects." % account
             if obj_counts:
                 print "  Max: %s, Min: %s" % (max(obj_counts), min(obj_counts))
         containers = set()