activeなジョブ数のカウント方法を分けた

https://github.com/syuilo/misskey/issues/4470#issuecomment-471827030
This commit is contained in:
syuilo 2019-03-12 12:31:01 +09:00
parent 0e97fec451
commit 612e3aafbc
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
2 changed files with 8 additions and 6 deletions

View file

@ -6,12 +6,12 @@
<div class="mntrproz"> <div class="mntrproz">
<div> <div>
<b>In</b> <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 ref="in"></div>
</div> </div>
<div> <div>
<b>Out</b> <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 ref="out"></div>
</div> </div>
</div> </div>
@ -42,12 +42,12 @@ export default define({
watch: { watch: {
stats(stats) { stats(stats) {
this.inChart.updateSeries([{ 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 })) data: stats.map((x, i) => ({ x: i, y: x.inbox.delayed }))
}]); }]);
this.outChart.updateSeries([{ 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 })) data: stats.map((x, i) => ({ x: i, y: x.deliver.delayed }))
}]); }]);

View file

@ -33,12 +33,14 @@ export default function() {
const stats = { const stats = {
deliver: { deliver: {
active: activeDeliverJobs, activeSincePrevTick: activeDeliverJobs,
active: deliverJobCounts.active,
waiting: deliverJobCounts.waiting, waiting: deliverJobCounts.waiting,
delayed: deliverJobCounts.delayed delayed: deliverJobCounts.delayed
}, },
inbox: { inbox: {
active: activeInboxJobs, activeSincePrevTick: activeInboxJobs,
active: inboxJobCounts.active,
waiting: inboxJobCounts.waiting, waiting: inboxJobCounts.waiting,
delayed: inboxJobCounts.delayed delayed: inboxJobCounts.delayed
} }