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

chg: [cleanup] removed duplicate logging code

pull/3530/head
iglocska 2018-08-03 10:31:08 +02:00
parent ba52868982
commit c1441d3fac
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/Model/Event.php
View File

@ -935,19 +935,7 @@ class Event extends AppModel
$uploadFailed = true;
}
if (!is_array($json) || $uploadFailed) {
$this->Log = ClassRegistry::init('Log');
$this->Log->create();
$this->Log->save(array(
'org' => 'SYSTEM',
'model' => 'Server',
'model_id' => $server['Server']['id'],
'email' => 'SYSTEM',
'action' => 'warning',
'user_id' => 0,
'title' => 'Uploading Event (' . $event['Event']['id'] . ') to Server (' . $server['Server']['id'] . ')',
'change' => 'Returned message: ', $newTextBody,
));
return false;
return $this->__logUploadResult($server, $event, $newTextBody);
}
// get the remote event_id
foreach ($json as $jsonEvent) {
@ -958,19 +946,7 @@ class Event extends AppModel
}
}
} else {
$this->Log = ClassRegistry::init('Log');
$this->Log->create();
$this->Log->save(array(
'org' => 'SYSTEM',
'model' => 'Server',
'model_id' => $server['Server']['id'],
'email' => 'SYSTEM',
'action' => 'warning',
'user_id' => 0,
'title' => 'Uploading Event (' . $event['Event']['id'] . ') to Server (' . $server['Server']['id'] . ')',
'change' => 'Returned message: ', $newTextBody,
));
return false;
return $this->__logUploadResult($server, $event, $newTextBody);
}
}
}
@ -4863,4 +4839,22 @@ class Event extends AppModel
$eventLock = ClassRegistry::init('EventLock');
$eventLock->insertLock($user, $id);
}
private function __logUploadResult($server, $event, $newTextBody)
{
$this->Log = ClassRegistry::init('Log');
$this->Log->create();
$this->Log->save(array(
'org' => 'SYSTEM',
'model' => 'Server',
'model_id' => $server['Server']['id'],
'email' => 'SYSTEM',
'action' => 'warning',
'user_id' => 0,
'title' => 'Uploading Event (' . $event['Event']['id'] . ') to Server (' . $server['Server']['id'] . ')',
'change' => 'Returned message: ', $newTextBody,
));
return false;
}
}