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

Merge branch '2.4' of https://github.com/MISP/MISP into 2.4

pull/4832/head
chrisr3d 2019-07-02 22:08:11 +02:00
parent b40582679d 5b6b4777f2
commit f651a030aa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/EventsController.php
View File

@ -3507,7 +3507,6 @@ class EventsController extends AppController
'org_id' => $this->Auth->user('org_id'),
'orgc_id' => $this->Auth->user('org_id'),
'timestamp' => $ts,
'uuid' => CakeText::uuid(),
'user_id' => $this->Auth->user('id'),
));
$default['Event']['info'] = 'A junk event for load testing';
@ -3517,6 +3516,7 @@ class EventsController extends AppController
$default['Event']['distribution'] = '0';
for ($i = 0; $i < 50; $i++) {
$data = $default;
$data['Event']['uuid'] = CakeText::uuid();
for ($j = 0; $j < 3000; $j++) {
$value = mt_rand();
$data['Attribute'][] = array(
@ -3530,6 +3530,7 @@ class EventsController extends AppController
'comment' => '',
'uuid' => CakeText::uuid(),
'timestamp' => $ts,
'disable_correlation' => 1
);
}
$this->Event->create();

2
app/files/misp-objects

@ -1 +1 @@
Subproject commit e7bb12af7daa0d771dd558bf7707610d7e9b46ed
Subproject commit c3618fcf5288496a6af079ab73a772e66b5dce87