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

chg: Added the tracking to all queued jobs

pull/1438/head
iglocska 2016-08-15 16:30:37 +02:00
parent 3846e9dce6
commit 7b6604de5b
6 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Controller/AppController.php
View File

@ -568,7 +568,8 @@ class AppController extends Controller {
$process_id = CakeResque::enqueue(
'default',
'AdminShell',
array('jobUpgrade24', $jobId, $this->Auth->user('id'))
array('jobUpgrade24', $jobId, $this->Auth->user('id')),
true
);
$job->saveField('process_id', $process_id);
$this->Session->setFlash(__('Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs).'));

3
app/Controller/AttributesController.php
View File

@ -1928,7 +1928,8 @@ class AttributesController extends AppController {
$process_id = CakeResque::enqueue(
'default',
'AdminShell',
array('jobGenerateCorrelation', $jobId)
array('jobGenerateCorrelation', $jobId),
true
);
$job->saveField('process_id', $process_id);
$this->Session->setFlash(__('Job queued. You can view the progress if you navigate to the active jobs view (administration -> jobs).'));

3
app/Controller/FeedsController.php
View File

@ -132,7 +132,8 @@ class FeedsController extends AppController {
$process_id = CakeResque::enqueue(
'default',
'ServerShell',
array('fetchFeed', $this->Auth->user('id'), $feedId, $jobId)
array('fetchFeed', $this->Auth->user('id'), $feedId, $jobId),
true
);
$this->Job->saveField('process_id', $process_id);
$message = 'Pull queued for background execution.';

9
app/Model/Event.php
View File

@ -1486,7 +1486,8 @@ class Event extends AppModel {
$process_id = CakeResque::enqueue(
'email',
'EventShell',
array('alertemail', $user['id'], $jobId, $id)
array('alertemail', $user['id'], $jobId, $id),
true
);
$job->saveField('process_id', $process_id);
return true;
@ -2224,7 +2225,8 @@ class Event extends AppModel {
$process_id = CakeResque::enqueue(
'prio',
'EventShell',
array('publish', $id, $passAlong, $jobId, $user['id'])
array('publish', $id, $passAlong, $jobId, $user['id']),
true
);
$job->saveField('process_id', $process_id);
return $process_id;
@ -2306,7 +2308,8 @@ class Event extends AppModel {
$process_id = CakeResque::enqueue(
'email',
'EventShell',
array('contactemail', $id, $message, $creator_only, $user['id'], $isSiteAdmin, $jobId)
array('contactemail', $id, $message, $creator_only, $user['id'], $isSiteAdmin, $jobId),
true
);
$job->saveField('process_id', $process_id);
return true;

3
app/Model/Post.php
View File

@ -47,7 +47,8 @@ class Post extends AppModel {
$process_id = CakeResque::enqueue(
'email',
'EventShell',
array('postsemail', $user_id, $post_id, $event_id, $title, $message, $jobId)
array('postsemail', $user_id, $post_id, $event_id, $title, $message, $jobId),
true
);
$job->saveField('process_id', $process_id);
return true;

3
app/Model/ShadowAttribute.php
View File

@ -571,7 +571,8 @@ class ShadowAttribute extends AppModel {
$process_id = CakeResque::enqueue(
'default',
'AdminShell',
array('jobGenerateShadowAttributeCorrelation', $jobId)
array('jobGenerateShadowAttributeCorrelation', $jobId),
true
);
$job->saveField('process_id', $process_id);
$this->Log->create();