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

chg: fix issues with servershell pull/push commands

pull/7939/head
Luciano Righetti 2021-10-29 14:52:42 +02:00
parent a617c089c2
commit 321acb629e
4 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -19,6 +19,7 @@ class ServerShell extends AppShell
public function initialize(): void
{
parent::initialize();
$this->BackgroundJobsTool = new BackgroundJobsTool();
$this->BackgroundJobsTool->initTool(Configure::read('BackgroundJobs'));
}
@ -89,7 +90,7 @@ class ServerShell extends AppShell
foreach ($servers as $serverId => $serverName) {
$jobId = $this->BackgroundJobsTool->enqueue(
$backgroundJobId = $this->BackgroundJobsTool->enqueue(
BackgroundJobsTool::DEFAULT_QUEUE,
BackgroundJobsTool::CMD_SERVER,
[
@ -100,7 +101,7 @@ class ServerShell extends AppShell
]
);
$this->out("Enqueued pulling from $serverName server as job $jobId");
$this->out("Enqueued pulling from $serverName server as job $backgroundJobId");
}
}
@ -122,7 +123,7 @@ class ServerShell extends AppShell
if (!empty($this->args[3])) {
$jobId = $this->args[3];
} else {
$jobId = $this->Job->createJob($user,Job::WORKER_DEFAULT, 'pull', 'Server: ' . $serverId, 'Pulling.');
$jobId = $this->Job->createJob($user, Job::WORKER_DEFAULT, 'pull', 'Server: ' . $serverId, 'Pulling.');
}
$force = false;
if (!empty($this->args[4]) && $this->args[4] === 'force') {
@ -154,23 +155,12 @@ class ServerShell extends AppShell
$user = $this->getUser($userId);
$serverId = $this->args[1];
$server = $this->getServer($serverId);
if (!empty($this->args[2])) {
$jobId = $this->args[2];
$technique = empty($this->args[2]) ? 'full' : $this->args[2];
if (!empty($this->args[3])) {
$jobId = $this->args[3];
} else {
$this->Job->create();
$data = array(
'worker' => 'default',
'job_type' => 'push',
'job_input' => 'Server: ' . $serverId,
'status' => 0,
'retries' => 0,
'org' => $user['Organisation']['name'],
'message' => 'Pushing.',
);
$this->Job->save($data);
$jobId = $this->Job->id;
$jobId = $this->Job->createJob($user, Job::WORKER_DEFAULT, 'push', 'Server: ' . $serverId, 'Pushing.');
}
$technique = empty($this->args[3]) ? 'full' : $this->args[3];
$this->Job->read(null, $jobId);
App::uses('SyncTool', 'Tools');
@ -368,7 +358,7 @@ class ServerShell extends AppShell
if (!empty($this->args[2])) {
$jobId = $this->args[2];
} else {
$jobId = $this->Job->createJob($user,Job::WORKER_DEFAULT, 'cache_feeds', 'Feed: ' . $scope, 'Starting feed caching.');
$jobId = $this->Job->createJob($user, Job::WORKER_DEFAULT, 'cache_feeds', 'Feed: ' . $scope, 'Starting feed caching.');
}
try {
$result = $this->Feed->cacheFeedInitiator($user, $jobId, $scope);

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

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

3
app/Controller/JobsController.php
View File

@ -30,11 +30,12 @@ class JobsController extends AppController
}
$jobs = $this->paginate();
foreach ($jobs as &$job) {
if ($job['Job']['process_id'] !== false) {
if (!empty($job['Job']['process_id'])) {
$job['Job']['job_status'] = $this->getJobStatus($job['Job']['process_id']);
$job['Job']['failed'] = $job['Job']['job_status'] === 'Failed';
} else {
$job['Job']['job_status'] = 'Unknown';
$job['Job']['failed'] = null;
}
$job['Job']['worker_status'] = isset($workers[$job['Job']['worker']]) && $workers[$job['Job']['worker']]['ok'];
}