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

chg: update supervisorphp/supervisor to v5

pull/9540/head
Luciano Righetti 2024-02-13 13:54:29 +01:00
parent 1818a22a4a
commit 4d8212b014
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
composer.json
View File

@ -1,9 +1,9 @@
{ {
"name": "cakephp/app", "name": "misp/misp",
"description": "CakePHP skeleton app", "description": "MISP: Open Source Threat Intelligence Platform & Open Standards For Threat Information Sharing",
"homepage": "https://cakephp.org", "homepage": "https://cakephp.org",
"type": "project", "type": "project",
"license": "MIT", "license": " AGPL-3.0",
"require": { "require": {
"php": ">=8.0", "php": ">=8.0",
"admad/cakephp-social-auth": "^1.1", "admad/cakephp-social-auth": "^1.1",
@ -19,7 +19,7 @@
"pear/crypt_gpg": "^1.6", "pear/crypt_gpg": "^1.6",
"php-http/message": "^1.16", "php-http/message": "^1.16",
"php-http/message-factory": "^1.1", "php-http/message-factory": "^1.1",
"supervisorphp/supervisor": "^4.0" "supervisorphp/supervisor": "^5.0"
}, },
"require-dev": { "require-dev": {
"cakephp/bake": "^2.0.3", "cakephp/bake": "^2.0.3",
@ -86,4 +86,4 @@
"php-http/discovery": true "php-http/discovery": true
} }
} }
} }

14
src/Lib/Tools/BackgroundJobsTool.php
View File

@ -387,7 +387,7 @@ class BackgroundJobsTool
foreach ($procs as $proc) { foreach ($procs as $proc) {
if ($proc->offsetGet('group') === self::MISP_WORKERS_PROCESS_GROUP) { if ($proc->offsetGet('group') === self::MISP_WORKERS_PROCESS_GROUP) {
$name = explode("_", $proc->offsetGet('name'))[0]; $name = explode("_", $proc->offsetGet('name'))[0];
if ($name === $queue && $proc->offsetGet('state') != \Supervisor\Process::RUNNING) { if ($name === $queue && $proc->offsetGet('state') != \Supervisor\ProcessStates::Running) {
return $this->getSupervisor()->startProcess( return $this->getSupervisor()->startProcess(
sprintf( sprintf(
'%s:%s', '%s:%s',
@ -514,7 +514,7 @@ class BackgroundJobsTool
*/ */
public function getSupervisorStatus(): bool public function getSupervisorStatus(): bool
{ {
return $this->getSupervisor()->getState()['statecode'] === \Supervisor\Supervisor::RUNNING; return $this->getSupervisor()->getState()['statecode'] === \Supervisor\ProcessStates::Running;
} }
/** /**
@ -664,12 +664,6 @@ class BackgroundJobsTool
) )
); );
if (class_exists('Supervisor\Connector\XmlRpc')) {
// for compatibility with older versions of supervisor
$connector = new \Supervisor\Connector\XmlRpc($client);
return new \Supervisor\Supervisor($connector);
}
return new \Supervisor\Supervisor($client); return new \Supervisor\Supervisor($client);
} }
@ -727,9 +721,9 @@ class BackgroundJobsTool
private function convertProcessStatus(int $stateId): int private function convertProcessStatus(int $stateId): int
{ {
switch ($stateId) { switch ($stateId) {
case \Supervisor\Process::RUNNING: case \Supervisor\ProcessStates::Running:
return Worker::STATUS_RUNNING; return Worker::STATUS_RUNNING;
case \Supervisor\Process::UNKNOWN: case \Supervisor\ProcessStates::Unknown:
return Worker::STATUS_UNKNOWN; return Worker::STATUS_UNKNOWN;
default: default:
return Worker::STATUS_FAILED; return Worker::STATUS_FAILED;