deon/khosb
Archived
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Fixes for ADSL traffic collection and other ADSL items

Browse Source
This commit is contained in:
Deon George
2013-01-11 21:51:37 +11:00
parent 94b7b4bcd4
commit 7819a05515
16 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/task/classes/Model/Task.php
View File

@@ -17,7 +17,7 @@ class Model_Task extends ORM_OSB {
),
);
public function run() {
public function run($force=FALSE) {
$r = rand(0,9999);
$tlo = ORM::factory('Task_Log');
$tlo->task_id = $this->id;
@@ -28,7 +28,7 @@ class Model_Task extends ORM_OSB {
elseif (! $this->status)
$tlo->message = sprintf('Task %s is not active',$this->id);
elseif ($this->running)
elseif ($this->running AND ! $force)
$tlo->message = sprintf('Task %s is already running',$this->id);
elseif (! preg_match('/\//',$this->command))

4
modules/task/classes/Task/Task/Run.php
View File

@@ -12,7 +12,7 @@
*/
class Task_Task_Run extends Task {
protected function _execute(array $params) {
if (isset($params['id'])) {
if ($params['id']) {
$to = ORM::factory('Task',$params['id']);
if ($to->loaded()) {
@@ -20,7 +20,7 @@ class Task_Task_Run extends Task {
throw new Minion_Exception_InvalidTask('Task :task (:name) NOT active',array(':task'=>$params['id'],':name'=>$to->name));
if (! Kohana::$config->load('debug')->task_sim)
$to->run();
$to->run($params['force']);
else
printf('Would Run task: (%s) %s',$params['id'],$to->name);