ジョブキューのlimitを表示するように

mei23 · Apr 19, 2019 · 374d651 · 374d651
1 parent 9090061
commit 374d651
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/client/app/admin/views/queue.vue b/src/client/app/admin/views/queue.vue
@@ -13,7 +13,7 @@
 				<ui-input :value="latestStats.deliver.active | number" type="text" readonly>
 					<span>Active</span>
 					<template #prefix><fa :icon="farPlayCircle"/></template>
-					<template #suffix>jobs</template>
+					<template #suffix>{{ `/ ${latestStats.deliver.limit | number} jobs` }}</template>
 				</ui-input>
 				<ui-input :value="latestStats.deliver.waiting | number" type="text" readonly>
 					<span>Waiting</span>
@@ -39,7 +39,7 @@
 				<ui-input :value="latestStats.inbox.active | number" type="text" readonly>
 					<span>Active</span>
 					<template #prefix><fa :icon="farPlayCircle"/></template>
-					<template #suffix>jobs</template>
+					<template #suffix>{{ `/ ${latestStats.inbox.limit | number} jobs` }}</template>
 				</ui-input>
 				<ui-input :value="latestStats.inbox.waiting | number" type="text" readonly>
 					<span>Waiting</span>

diff --git 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.waiting | number }}</span>
+				<span v-if="latestStats">{{ latestStats.inbox.active | number }} / {{ latestStats.inbox.limit | number }} ({{ latestStats.inbox.waiting | number }})</span>
 				<div ref="in"></div>
 			</div>
 			<div>
 				<b>Out</b>
-				<span v-if="latestStats">{{ latestStats.deliver.active | number }} / {{ latestStats.deliver.waiting | number }}</span>
+				<span v-if="latestStats">{{ latestStats.deliver.active | number }} / {{ latestStats.deliver.limit | number }} ({{ latestStats.deliver.waiting | number }})</span>
 				<div ref="out"></div>
 			</div>
 		</div>

diff --git a/src/daemons/queue-stats.ts b/src/daemons/queue-stats.ts
@@ -1,11 +1,19 @@
 import * as Deque from 'double-ended-queue';
 import Xev from 'xev';
 import { deliverQueue, inboxQueue } from '../queue';
+import { program } from './../argv';
+import config from '../config';
+import * as os from 'os';
 
 const ev = new Xev();
 
 const interval = 3000;
 
+const workers = program.disableClustering ? 1 : Math.min(config.clusterLimit || Infinity, os.cpus().length);
+
+const deliverConcurrencyPerWorker = config.deliverJobConcurrency || 32;
+const inboxConcurrencyPerWorker = config.inboxJobConcurrency || 32;
+
 /**
  * Report queue stats regularly
  */
@@ -33,12 +41,14 @@ export default function() {
 
 		const stats = {
 			deliver: {
+				limit: deliverConcurrencyPerWorker * workers,
 				activeSincePrevTick: activeDeliverJobs,
 				active: deliverJobCounts.active,
 				waiting: deliverJobCounts.waiting,
 				delayed: deliverJobCounts.delayed
 			},
 			inbox: {
+				limit: inboxConcurrencyPerWorker * workers,
 				activeSincePrevTick: activeInboxJobs,
 				active: inboxJobCounts.active,
 				waiting: inboxJobCounts.waiting,