From 612e3aafbcdda48e475141dd0170f8fb860f2b4d Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 12 Mar 2019 12:31:01 +0900 Subject: [PATCH] =?UTF-8?q?active=E3=81=AA=E3=82=B8=E3=83=A7=E3=83=96?= =?UTF-8?q?=E6=95=B0=E3=81=AE=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E3=82=92=E5=88=86=E3=81=91=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/syuilo/misskey/issues/4470#issuecomment-471827030 --- src/client/app/common/views/widgets/queue.vue | 8 ++++---- src/daemons/queue-stats.ts | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) 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 }