controllers/admin.py: make index() use monitor()

server/web2py/applications/vidjil/controllers/admin.py

@@ -19,10 +19,8 @@ def index():
         p = subprocess.Popen(["df", "-h"], stdout=subprocess.PIPE)
         disk_use, err = p.communicate()
         
-        return dict(worker = len(db().select(db.scheduler_worker.ALL)),
-                    queued = len(db(db.scheduler_task.status=='QUEUED').select()),                    
-                    assigned = len(db(db.scheduler_task.status=='ASSIGNED').select()),
-                    running = len(db(db.scheduler_task.status=='RUNNING').select()),
+        d = monitor()
+        return dict(d,
                     uptime=uptime,
                     disk_use=disk_use
                     )

server/web2py/applications/vidjil/views/admin/index.html

@@ -33,6 +33,7 @@
         <div class="console-flex">QUEUED: {{=queued}}</div>
         <div class="console-flex">ASSIGNED: {{=assigned}}</div>
         <div class="console-flex">RUNNING: {{=running}}</div>
+        <div class="console-flex">LAST_RESULTS: {{=last_results}}...</div>
     </div>
 </div>