diff --git a/src/client/app/common/views/widgets/queue.vue b/src/client/app/common/views/widgets/queue.vue index 18bfeb3ba9..671163b7b7 100644 --- a/src/client/app/common/views/widgets/queue.vue +++ b/src/client/app/common/views/widgets/queue.vue @@ -6,12 +6,12 @@
In - {{ latestStats.inbox.active | number }} / {{ latestStats.inbox.delayed | number }} + {{ latestStats.inbox.activeSincePrevTick | number }} / {{ latestStats.inbox.delayed | number }}
Out - {{ latestStats.deliver.active | number }} / {{ latestStats.deliver.delayed | number }} + {{ latestStats.deliver.activeSincePrevTick | number }} / {{ latestStats.deliver.delayed | number }}
@@ -42,12 +42,12 @@ export default define({ watch: { stats(stats) { this.inChart.updateSeries([{ - data: stats.map((x, i) => ({ x: i, y: x.inbox.active })) + data: stats.map((x, i) => ({ x: i, y: x.inbox.activeSincePrevTick })) }, { data: stats.map((x, i) => ({ x: i, y: x.inbox.delayed })) }]); this.outChart.updateSeries([{ - data: stats.map((x, i) => ({ x: i, y: x.deliver.active })) + data: stats.map((x, i) => ({ x: i, y: x.deliver.activeSincePrevTick })) }, { data: stats.map((x, i) => ({ x: i, y: x.deliver.delayed })) }]); diff --git a/src/daemons/queue-stats.ts b/src/daemons/queue-stats.ts index f242f3d9f3..a233198610 100644 --- a/src/daemons/queue-stats.ts +++ b/src/daemons/queue-stats.ts @@ -33,12 +33,14 @@ export default function() { const stats = { deliver: { - active: activeDeliverJobs, + activeSincePrevTick: activeDeliverJobs, + active: deliverJobCounts.active, waiting: deliverJobCounts.waiting, delayed: deliverJobCounts.delayed }, inbox: { - active: activeInboxJobs, + activeSincePrevTick: activeInboxJobs, + active: inboxJobCounts.active, waiting: inboxJobCounts.waiting, delayed: inboxJobCounts.delayed }