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

Fix to setting the job progress before initialising the model when correlating proposals

pull/953/head
Iglocska 2016-02-17 14:51:17 +01:00
parent 926a5fabeb
commit 2a2aaa9d1b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Model/ShadowAttribute.php
View File

@ -562,6 +562,10 @@ class ShadowAttribute extends AppModel {
// get all proposals..
$proposals = $this->find('all', array('recursive' => -1, 'conditions' => array('ShadowAttribute.deleted' => 0, 'ShadowAttribute.proposal_to_delete' => 0)));
$proposalCount = count($proposals);
if ($jobId && Configure::read('MISP.background_jobs')) {
$this->Job = ClassRegistry::init('Job');
$this->Job->id = $jobId;
}
if ($proposalCount > 0) {
foreach ($proposals as $k => $proposal) {
$this->__afterSaveCorrelation($proposal['ShadowAttribute']);
@ -571,8 +575,6 @@ class ShadowAttribute extends AppModel {
}
}
if ($jobId && Configure::read('MISP.background_jobs')) {
$this->Job = ClassRegistry::init('Job');
$this->Job->id = $jobId;
$this->Job->saveField('progress', 100);
$this->Job->saveField('status', 4);
$this->Job->saveField('message', 'Job done.');