From 612e3aafbcdda48e475141dd0170f8fb860f2b4d Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Tue, 12 Mar 2019 12:31:01 +0900
Subject: activeなジョブ数のカウント方法を分けた
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(-)

(limited to 'src')

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 @@
 		<div class="mntrproz">
 			<div>
 				<b>In</b>
-				<span v-if="latestStats">{{ latestStats.inbox.active | number }} / {{ latestStats.inbox.delayed | number }}</span>
+				<span v-if="latestStats">{{ latestStats.inbox.activeSincePrevTick | number }} / {{ latestStats.inbox.delayed | number }}</span>
 				<div ref="in"></div>
 			</div>
 			<div>
 				<b>Out</b>
-				<span v-if="latestStats">{{ latestStats.deliver.active | number }} / {{ latestStats.deliver.delayed | number }}</span>
+				<span v-if="latestStats">{{ latestStats.deliver.activeSincePrevTick | number }} / {{ latestStats.deliver.delayed | number }}</span>
 				<div ref="out"></div>
 			</div>
 		</div>
@@ -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
 			}
-- 
cgit v1.2.3-freya