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

chg: [feed] Better error handling for cacheFeedInitiator method

pull/5052/head
Jakub Onderka 2019-08-28 17:01:07 +02:00
parent d7809df2d0
commit de2b143748
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -253,13 +253,19 @@ class ServerShell extends AppShell
$jobId = $this->Job->id;
}
$this->Job->read(null, $jobId);
$result = $this->Feed->cacheFeedInitiator($user, $jobId, $scope);
try {
$result = $this->Feed->cacheFeedInitiator($user, $jobId, $scope);
} catch (Exception $e) {
CakeLog::error($e->getMessage());
$result = false;
}
$this->Job->id = $jobId;
if ($result !== true) {
$message = 'Job Failed. Reason: ';
$message = 'Job failed. See logs for more details.';
$this->Job->save(array(
'id' => $jobId,
'message' => $message . $result,
'message' => $message,
'progress' => 0,
'status' => 3
));

15
app/Model/Feed.php
View File

@ -945,6 +945,13 @@ class Feed extends AppModel
return true;
}
/**
* @param $user Not used
* @param int|bool $jobId
* @param string $scope
* @return bool Returns true if at least one feed was cached sucessfully.
* @throws Exception
*/
public function cacheFeedInitiator($user, $jobId = false, $scope = 'freetext')
{
$params = array(
@ -954,7 +961,7 @@ class Feed extends AppModel
);
$redis = $this->setupRedis();
if ($redis === false) {
return 'Redis not reachable.';
throw new Exception('Could not reach Redis.');
}
if ($scope !== 'all') {
if (is_numeric($scope)) {
@ -964,22 +971,26 @@ class Feed extends AppModel
} elseif ($scope == 'misp') {
$redis->del('misp:feed_cache:event_uuid_lookup:');
$params['conditions']['source_format'] = 'misp';
} else {
throw new InvalidArgumentException("Invalid value for scope, it must be integer or 'freetext', 'csv', 'misp' or 'all' string.");
}
} else {
$redis->del('misp:feed_cache:combined');
$redis->del('misp:feed_cache:event_uuid_lookup:');
}
$feeds = $this->find('all', $params);
$atLeastOneSuccess = false;
foreach ($feeds as $k => $feed) {
if ($this->__cacheFeed($feed, $redis, $jobId)) {
$message = 'Feed ' . $feed['Feed']['id'] . ' cached.';
$atLeastOneSuccess = true;
} else {
$message = 'Failed to cache feed ' . $feed['Feed']['id'] . '. See logs for more details.';
}
$this->jobProgress($jobId, $message, 100 * $k / count($feeds));
}
return true;
return $atLeastOneSuccess;
}
public function attachFeedCacheTimestamps($data)