Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@fastify/express": "^2.3.0",
"bee-queue": "^1.4.0",
"bull": "^4.12.4",
"bullmq": "^5.51.0",
"bullmq": "^5.63.0",
"express": "^4.17.1",
"fastify": "^4.13.0"
}
Expand Down
459 changes: 227 additions & 232 deletions example/yarn.lock

Large diffs are not rendered by default.

155 changes: 6 additions & 149 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"@semantic-release/github": "^7.0.7",
"@semantic-release/npm": "^7.0.5",
"@semantic-release/release-notes-generator": "^9.0.1",
"bee-queue": "^1.2.3",
"bull": "^3.16.0",
"commitizen": "^4.2.5",
"conventional-changelog-conventionalcommits": "^4.3.0",
Expand Down
11 changes: 10 additions & 1 deletion src/server/views/dashboard/queueDetails.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const {rest} = require('lodash');
const QueueHelpers = require('../helpers/queueHelpers');

async function handler(req, res) {
Expand All @@ -14,12 +15,19 @@ async function handler(req, res) {
hasFlows: Flows.hasFlows(),
});

let jobCounts, isPaused;
let jobCounts, isPaused, globalConfig;
if (queue.IS_BEE) {
jobCounts = await queue.checkHealth();
delete jobCounts.newestJob;
} else if (queue.IS_BULLMQ) {
jobCounts = await queue.getJobCounts(...QueueHelpers.BULLMQ_STATES);
if (queue.getMeta) {
const meta = await queue.getMeta();
if (meta) {
const {paused, ...restMeta} = meta;
globalConfig = restMeta;
}
}
} else {
jobCounts = await queue.getJobCounts();
}
Expand All @@ -37,6 +45,7 @@ async function handler(req, res) {
queueIsBee: !!queue.IS_BEE,
queueIsBullMQ: !!queue.IS_BULLMQ,
hasFlows: Flows.hasFlows(),
globalConfig,
jobCounts,
stats,
});
Expand Down
17 changes: 17 additions & 0 deletions src/server/views/dashboard/templates/queueDetails.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,23 @@
</table>
</div>
</div>
{{#if globalConfig}}
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">Global Configuration</h4>
</div>
<div class="panel-body">
<table class="table">
{{#each globalConfig}}
<tr>
<th>{{ @key }}</th>
<th>{{ this }}</th>
</tr>
{{/each}}
</table>
</div>
</div>
{{/if}}
</div>
</div>

Expand Down
Loading