Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vidjil
vidjil
Commits
edbf8c53
Commit
edbf8c53
authored
Feb 22, 2015
by
Mathieu Giraud
Committed by
Vidjil Team
Feb 22, 2015
Browse files
controllers/admin.py: make index() use monitor()
parent
01e5b7b9
Changes
2
Hide whitespace changes
Inline
Side-by-side
server/web2py/applications/vidjil/controllers/admin.py
View file @
edbf8c53
...
...
@@ -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
View file @
edbf8c53
...
...
@@ -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>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment