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

issue 1289 - Cache jobs do not update the date modified once completed. 

I also added this to the contactemail(), publish(), postsemail() and alertemail(). But it's commented out as it's not part of the issue. I can commit it again w/ the lines uncommented.
pull/1315/head
Cristian Bell 2016-06-29 22:46:48 +02:00
parent 7ef3f4615c
commit 74e6f9873d
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Console/Command/EventShell.php
View File

@ -60,6 +60,7 @@ class EventShell extends AppShell
}
$this->Job->saveField('progress', 100);
$this->Job->saveField('message', 'Job done.');
$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
$file->append('<xml_version>' . $this->Event->mispVersion . '</xml_version>');
$file->append('</response>' . PHP_EOL);
$file->close();
@ -110,6 +111,7 @@ class EventShell extends AppShell
$file->close();
$this->Job->saveField('progress', '100');
$this->Job->saveField('message', 'Job done.');
$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
}
public function cacherpz() {
@ -148,6 +150,7 @@ class EventShell extends AppShell
$file->close();
$this->Job->saveField('progress', '100');
$this->Job->saveField('message', 'Job done.');
$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
}
public function cachecsv() {
@ -184,6 +187,7 @@ class EventShell extends AppShell
$file->close();
$this->Job->saveField('progress', '100');
$this->Job->saveField('message', 'Job done.');
$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
}
public function cachetext() {
@ -210,6 +214,7 @@ class EventShell extends AppShell
}
$this->Job->saveField('progress', 100);
$this->Job->saveField('message', 'Job done.');
$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
}
public function cachenids() {
@ -243,6 +248,7 @@ class EventShell extends AppShell
$file->close();
$this->Job->saveField('progress', '100');
$this->Job->saveField('message', 'Job done.');
$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
}
public function alertemail() {
@ -254,6 +260,7 @@ class EventShell extends AppShell
$result = $this->Event->sendAlertEmail($eventId, $user, $processId);
$job['Job']['progress'] = 100;
$job['Job']['message'] = 'Emails sent.';
//$job['Job']['date_modified'] = date("y-m-d H:i:s");
$this->Job->save($job);
}
@ -268,6 +275,7 @@ class EventShell extends AppShell
$user = $this->User->getAuthUser($userId);
$result = $this->Event->sendContactEmail($id, $message, $all, array('User' => $user), $isSiteAdmin);
$this->Job->saveField('progress', '100');
//$this->Job->saveField('date_modified', date("y-m-d H:i:s"));
if ($result != true) $this->Job->saveField('message', 'Job done.');
}
@ -282,6 +290,7 @@ class EventShell extends AppShell
$result = $this->Post->sendPostsEmail($userId, $postId, $eventId, $title, $message);
$job['Job']['progress'] = 100;
$job['Job']['message'] = 'Emails sent.';
//$job['Job']['date_modified'] = date("y-m-d H:i:s");
$this->Job->save($job);
}
@ -345,6 +354,7 @@ class EventShell extends AppShell
$this->Event->Behaviors->unload('SysLogLogable.SysLogLogable');
$result = $this->Event->publish($id, $passAlong);
$job['Job']['progress'] = 100;
//$job['Job']['date_modified'] = date("y-m-d H:i:s");
if ($result) {
$job['Job']['message'] = 'Event published.';
} else {