MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #8067 from righel/issue-8064 

fix: supervisord_status showing as a worker when its not
pull/8099/head
Andras Iklody 2022-01-11 10:17:55 +01:00 committed by GitHub
parent ee6f35f26c 6af197693e
commit 51e461f44b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Lib/Tools/BackgroundJobsTool.php
View File

@ -58,7 +58,8 @@ class BackgroundJobsTool
EMAIL_QUEUE = 'email',
CACHE_QUEUE = 'cache',
PRIO_QUEUE = 'prio',
UPDATE_QUEUE = 'update';
UPDATE_QUEUE = 'update',
SCHEDULER_QUEUE = 'scheduler';
const VALID_QUEUES = [
self::DEFAULT_QUEUE,
@ -66,6 +67,7 @@ class BackgroundJobsTool
self::CACHE_QUEUE,
self::PRIO_QUEUE,
self::UPDATE_QUEUE,
self::SCHEDULER_QUEUE,
];
const

2
app/View/Elements/healthElements/workers.ctp
View File

@ -18,7 +18,7 @@
<?php
endif;
foreach ($worker_array as $type => $data):
if ($type == 'proc_accessible' or $type == 'controls') continue;
if (!in_array($type, BackgroundJobsTool::VALID_QUEUES)) continue;
$queueStatusMessage = __("Issues prevent jobs from being processed. Please resolve them below.");
$queueStatus = false;
if ($data['ok']) {