summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-03-15 13:09:19 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-03-15 13:09:19 +0900
commit09e25e6a02a851fe69e5871dd9a2ae5320f61b18 (patch)
treee4cdd59d0de7aa0b6cefdcbb3bfc64e196bcb3b9 /src
parentFix bug (diff)
downloadsharkey-09e25e6a02a851fe69e5871dd9a2ae5320f61b18.tar.gz
sharkey-09e25e6a02a851fe69e5871dd9a2ae5320f61b18.tar.bz2
sharkey-09e25e6a02a851fe69e5871dd9a2ae5320f61b18.zip
Better queue chart
Diffstat (limited to 'src')
-rw-r--r--src/client/app/admin/views/queue.vue14
-rw-r--r--src/daemons/queue-stats.ts2
2 files changed, 9 insertions, 7 deletions
diff --git a/src/client/app/admin/views/queue.vue b/src/client/app/admin/views/queue.vue
index 63ff87e7d3..3c23444c4d 100644
--- a/src/client/app/admin/views/queue.vue
+++ b/src/client/app/admin/views/queue.vue
@@ -9,7 +9,7 @@
<ui-input :value="latestStats.deliver.activeSincePrevTick | number" type="text" readonly>
<span>Process</span>
<template #prefix><fa :icon="fasPlayCircle"/></template>
- <template #suffix>jobs/s</template>
+ <template #suffix>jobs/tick</template>
</ui-input>
<ui-input :value="latestStats.deliver.active | number" type="text" readonly>
<span>Active</span>
@@ -36,7 +36,7 @@
<ui-input :value="latestStats.inbox.activeSincePrevTick | number" type="text" readonly>
<span>Process</span>
<template #prefix><fa :icon="fasPlayCircle"/></template>
- <template #suffix>jobs/s</template>
+ <template #suffix>jobs/tick</template>
</ui-input>
<ui-input :value="latestStats.inbox.active | number" type="text" readonly>
<span>Active</span>
@@ -131,8 +131,10 @@ export default Vue.extend({
},
mounted() {
- const chartOpts = {
+ const chartOpts = id => ({
chart: {
+ id,
+ group: 'queue',
type: 'area',
height: 200,
animations: {
@@ -186,10 +188,10 @@ export default Vue.extend({
show: false,
min: 0,
}
- };
+ });
- this.inboxChart = new ApexCharts(this.$refs.inboxChart, chartOpts);
- this.deliverChart = new ApexCharts(this.$refs.deliverChart, chartOpts);
+ this.inboxChart = new ApexCharts(this.$refs.inboxChart, chartOpts('a'));
+ this.deliverChart = new ApexCharts(this.$refs.deliverChart, chartOpts('b'));
this.inboxChart.render();
this.deliverChart.render();
diff --git a/src/daemons/queue-stats.ts b/src/daemons/queue-stats.ts
index 8c879c4ef0..00709f2607 100644
--- a/src/daemons/queue-stats.ts
+++ b/src/daemons/queue-stats.ts
@@ -4,7 +4,7 @@ import { deliverQueue, inboxQueue } from '../queue';
const ev = new Xev();
-const interval = 1000;
+const interval = 2000;
/**
* Report queue stats regularly