Show succeeded tasks

Author: mher

flower/static/js/flower.js

@@ -338,7 +338,7 @@ var flower = (function () {
 
     function on_dashboard_update(update) {
         var total_active = 0, total_processed = 0, total_failed = 0,
-            total_revoked = 0, total_retried = 0;
+            total_succeeded = 0, total_retried = 0;
 
         $.each(update, function (name) {
             var id = encodeURIComponent(name),
@@ -355,7 +355,7 @@ var flower = (function () {
                 active = tr.children('td:eq(3)'),
                 processed = tr.children('td:eq(4)'),
                 failed = tr.children('td:eq(5)'),
-                revoked = tr.children('td:eq(6)'),
+                succeeded = tr.children('td:eq(6)'),
                 retried = tr.children('td:eq(7)'),
                 loadavg = tr.children('td:eq(8)');
 
@@ -365,22 +365,22 @@ var flower = (function () {
             active.text($(this).attr('active'));
             processed.text($(this).attr('processed'));
             failed.text($(this).attr('failed'));
-            revoked.text($(this).attr('revoked'));
+            succeeded.text($(this).attr('succeeded'));
             retried.text($(this).attr('retried'));
             loadavg.text($(this).attr('loadavg').toString().replace(/,/g, ', '));
 
             total_active += $(this).attr('active');
             total_processed += $(this).attr('processed');
             total_failed += $(this).attr('failed');
-            total_revoked += $(this).attr('revoked');
+            total_succeeded += $(this).attr('succeeded');
             total_retried += $(this).attr('retried');
 
         });
 
         $('a#btn-active').text('Active: ' + total_active);
         $('a#btn-processed').text('Processed: ' + total_processed);
         $('a#btn-failed').text('Failed: ' + total_failed);
-        $('a#btn-revoked').text('Revoked: ' + total_revoked);
+        $('a#btn-succeeded').text('Succeeded: ' + total_succeeded);
         $('a#btn-retried').text('Retried: ' + total_retried);
     }
 

flower/templates/dashboard.html

@@ -10,7 +10,7 @@
         <a id="btn-active" class="btn btn-default btn-large" href="/tasks?limit=100&amp;state=STARTED">Active: {{ sum(map(lambda x:x.get('active', 0), workers.values() )) }}</a>
         <a id="btn-processed" class="btn btn-default btn-large" href="/tasks?limit=100">Processed: {{ sum(map(lambda x:x.get('task-received', 0), workers.values() )) }}</a>
         <a id="btn-failed" class="btn btn-default btn-large" href="/tasks?limit=100&amp;state=FAILURE">Failed: {{ sum(map(lambda x:x.get('task-failed', 0), workers.values() )) }}</a>
-        <a id="btn-revoked" class="btn btn-default btn-large" href="/tasks?limit=100&amp;state=REVOKED">Revoked: {{ sum(map(lambda x:x.get('task-revoked', 0), workers.values() )) }}</a>
+        <a id="btn-succeeded" class="btn btn-default btn-large" href="/tasks?limit=100&amp;state=SUCCESS">Succeeded: {{ sum(map(lambda x:x.get('task-succeeded', 0), workers.values() )) }}</a>
         <a id="btn-retried" class="btn btn-default btn-large" href="/tasks?limit=100&amp;state=RETRY">Retried: {{ sum(map(lambda x:x.get('task-retried', 0), workers.values() )) }}</a>
     </div>
 
@@ -51,7 +51,7 @@
         <th>Active</th>
         <th>Processed</th>
         <th>Failed</th>
-        <th>Revoked</th>
+        <th>Succeeded</th>
         <th>Retried</th>
         <th>Load Average</th>
       </tr>
@@ -71,7 +71,7 @@
         <td>{{ info['active'] }}</td>
         <td>{{ info.get('task-received', 0) }}</td>
         <td>{{ info.get('task-failed', 0) }}</td>
-        <td>{{ info.get('task-revoked', 0) }}</td>
+        <td>{{ info.get('task-succeeded', 0) }}</td>
         <td>{{ info.get('task-retried', 0) }}</td>
         <td>{{ humanize(info['loadavg']) }}</td>
       </tr>

flower/views/dashboard.py

@@ -90,7 +90,7 @@ def dashboard_update(cls, app):
                 active=worker.active,
                 processed=counter.get('task-received', 0),
                 failed=counter.get('task-failed', 0),
-                revoked=counter.get('task-revoked', 0),
+                succeeded=counter.get('task-succeeded', 0),
                 retried=counter.get('task-retried', 0),
                 loadavg=worker.loadavg)
         return workers