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

chg: rename settings

pull/7939/head
Luciano Righetti 2021-11-05 15:46:42 +01:00
parent 309f7ed50e
commit f80fcec2db
8 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Config/config.default.php
View File

@ -32,6 +32,7 @@ $config = array(
'email_subject_tag' => 'tlp',
'email_subject_include_tag_name' => true,
'background_jobs' => true,
'use_simple_background_jobs' => false,
'cached_attachments' => true,
'osuser' => 'www-data',
'email' => 'email@example.com',
@ -135,7 +136,7 @@ $config = array(
'amount' => 5,
'expire' => 300,
),
'BackgroundJobs' => array(
'SimpleBackgroundJobs' => array(
'enabled' => true,
'redis_host' => 'localhost',
'redis_port' => 6379,

2
app/Console/Command/MonitorWorkersShell.php
View File

@ -18,7 +18,7 @@ class MonitorWorkersShell extends AppShell
{
parent::initialize();
$this->BackgroundJobsTool = new BackgroundJobsTool();
$this->BackgroundJobsTool->initTool(Configure::read('BackgroundJobs'));
$this->BackgroundJobsTool->initTool(Configure::read('SimpleBackgroundJobs'));
}
public function getOptionParser(): ConsoleOptionParser

2
app/Console/Command/ServerShell.php
View File

@ -21,7 +21,7 @@ class ServerShell extends AppShell
{
parent::initialize();
$this->BackgroundJobsTool = new BackgroundJobsTool();
$this->BackgroundJobsTool->initTool(Configure::read('BackgroundJobs'));
$this->BackgroundJobsTool->initTool(Configure::read('SimpleBackgroundJobs'));
}
public function list()

2
app/Console/Command/StartWorkerShell.php
View File

@ -26,7 +26,7 @@ class StartWorkerShell extends AppShell
{
parent::initialize();
$this->BackgroundJobsTool = new BackgroundJobsTool();
$this->BackgroundJobsTool->initTool(Configure::read('BackgroundJobs'));
$this->BackgroundJobsTool->initTool(Configure::read('SimpleBackgroundJobs'));
}
public function getOptionParser(): ConsoleOptionParser

10
app/Controller/JobsController.php
View File

@ -37,7 +37,11 @@ class JobsController extends AppController
$job['Job']['job_status'] = 'Unknown';
$job['Job']['failed'] = null;
}
$job['Job']['worker_status'] = isset($workers[$job['Job']['worker']]) && $workers[$job['Job']['worker']]['ok'];
if(Configure::read('MISP.use_simple_background_jobs')){
$job['Job']['worker_status'] = true;
}else{
$job['Job']['worker_status'] = isset($workers[$job['Job']['worker']]) && $workers[$job['Job']['worker']]['ok'];
}
}
if ($this->_isRest()) {
return $this->RestResponse->viewData($jobs, $this->response->type());
@ -165,7 +169,7 @@ class JobsController extends AppController
private function getJobStatus(string $id): string
{
if (!Configure::read('BackgroundJobs.enabled')) {
if (!Configure::read('MISP.use_simple_background_jobs')) {
return $this->__jobStatusConverter(CakeResque::getJobStatus($id));
}
@ -177,7 +181,7 @@ class JobsController extends AppController
private function getFailedJobLog(string $id): array
{
if (!Configure::read('BackgroundJobs.enabled')) {
if (!Configure::read('MISP.use_simple_background_jobs')) {
return CakeResque::getFailedJobLog($id);
}

10
app/Controller/ServersController.php
View File

@ -1209,7 +1209,7 @@ class ServersController extends AppController
throw new MethodNotAllowedException();
}
if (Configure::read('BackgroundJobs.enabled')) {
if (Configure::read('MISP.use_simple_background_jobs')) {
$message = __('Worker start signal sent');
$this->Server->getBackgroundJobsTool()->startWorker($type);
@ -1261,7 +1261,7 @@ class ServersController extends AppController
$message = __('Worker stop signal sent');
if (Configure::read('BackgroundJobs.enabled')) {
if (Configure::read('MISP.use_simple_background_jobs')) {
$this->Server->getBackgroundJobsTool()->stopWorker($pid);
if ($this->_isRest()) {
return $this->RestResponse->saveSuccessResponse('Servers', 'stopWorker', $pid, $this->response->type(), $message);
@ -1539,7 +1539,7 @@ class ServersController extends AppController
throw new MethodNotAllowedException();
}
if (Configure::read('BackgroundJobs.enabled')) {
if (Configure::read('MISP.use_simple_background_jobs')) {
$this->Server->getBackgroundJobsTool()->restartWorkers();
} else {
// CakeResque
@ -1558,7 +1558,7 @@ class ServersController extends AppController
throw new MethodNotAllowedException();
}
if (Configure::read('BackgroundJobs.enabled')) {
if (Configure::read('MISP.use_simple_background_jobs')) {
$this->Server->getBackgroundJobsTool()->restartDeadWorkers();
} else {
// CakeResque
@ -1791,7 +1791,7 @@ class ServersController extends AppController
throw new MethodNotAllowedException();
}
if (Configure::read('BackgroundJobs.enabled')) {
if (Configure::read('MISP.use_simple_background_jobs')) {
$this->Server->getBackgroundJobsTool()->purgeQueue($worker);
} else {
// CakeResque

4
app/Model/AppModel.php
View File

@ -2566,8 +2566,8 @@ class AppModel extends Model
// TODO: remove after CakeResque is deprecated
$settings = ['enabled' => false];
if (Configure::read('BackgroundJobs')) {
$settings = Configure::read('BackgroundJobs');
if (Configure::read('SimpleBackgroundJobs') && Configure::read('MISP.use_simple_background_jobs')) {
$settings = Configure::read('SimpleBackgroundJobs');
}
$backgroundJobsTool = new BackgroundJobsTool();

2
app/Model/Server.php
View File

@ -7181,7 +7181,7 @@ class Server extends AppModel
*/
private function getWorkers(): array
{
if (!Configure::read('BackgroundJobs.enabled')) {
if (!Configure::read('MISP.use_simple_background_jobs')) {
try {
$this->ResqueStatus = new ResqueStatus\ResqueStatus(Resque::redis());
} catch (Exception $e) {