Improve event flush and stats commands verbosity

api/management/commands/event_stats.py

@@ -16,8 +16,9 @@ class Command(BaseCommand):
       print "\tTubes:"
       for t in queue.tubes():
         print "\t\t%s"%(t)
-      next = queue.peek_ready()
-      if next:
-        print "\tNext job: %s"%(next.body)
-      else:
-        print "\tNo pending job."
+        queue.use(t)
+        next = queue.peek_ready()
+        if next:
+          print "\t\t\tNext job: %s"%(next.body)
+        else:
+          print "\t\t\tNo pending job."

api/management/commands/flush_events.py

@@ -11,9 +11,9 @@ class Command(BaseCommand):
       queue = events.server_queue(s)
       stats = queue.stats()
       for t in queue.tubes():
-        queue.watch(t)
-      job = queue.reserve(0)
-      while job:
-        print "Deleting %s: %s"%(job.jid, job.body)
-        job.delete()
-        job = queue.reserve(0)
+        queue.use(t)
+        job = queue.peek_ready()
+        while job:
+          print "Deleting %s from %s: %s"%(job.jid, t, job.body)
+          job.delete()
+          job = queue.peek_ready()