Skip to content

Commit decbc3d

Browse files
committed
fix(background-jobs): Show status of scheduler in background-jobs page
1 parent a879986 commit decbc3d

2 files changed

Lines changed: 14 additions & 0 deletions

File tree

frappe/core/page/background_jobs/background_jobs.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ frappe.pages['background_jobs'].on_page_load = function(wrapper) {
1313

1414
frappe.pages['background_jobs'].on_page_show = function(wrapper) {
1515
frappe.pages.background_jobs.refresh_jobs();
16+
frappe.call({
17+
method: 'frappe.core.page.background_jobs.background_jobs.get_scheduler_status',
18+
callback: function(r) {
19+
frappe.pages.background_jobs.page.set_indicator(...r.message);
20+
}
21+
});
1622
}
1723

1824
frappe.pages.background_jobs.refresh_jobs = function() {

frappe/core/page/background_jobs/background_jobs.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
from rq import Queue, Worker
88
from frappe.utils.background_jobs import get_redis_conn
99
from frappe.utils import format_datetime, cint
10+
from frappe.utils.scheduler import is_scheduler_inactive
11+
from frappe import _
1012

1113
colors = {
1214
'queued': 'orange',
@@ -49,3 +51,9 @@ def add_job(j, name):
4951
for j in q.get_jobs()[:10]: add_job(j, q.name)
5052

5153
return jobs
54+
55+
@frappe.whitelist()
56+
def get_scheduler_status():
57+
if is_scheduler_inactive():
58+
return [_("Inactive"), "red"]
59+
return [_("Active"), "green"]

0 commit comments

Comments
 (0)