gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-11-28 10:30:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

count failed runs of a task

Browse Source
This commit is contained in:
Uwe Steinmann 2023-10-16 15:59:57 +02:00
parent bcf9b43576
commit fa429ca08f
9 changed files with 51 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/class.Cron.php
View File

@ -58,10 +58,14 @@ class SeedDMS_Controller_Cron extends SeedDMS_Controller_Common {
if($taskobj->execute($task)) {
add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." successful.");
$arr['success'] = true;
$task->resetFailures();
} else {
add_log_line("Execution of task ".$task->getExtension()."::".$task->getTask()." failed, task has been disabled.", PEAR_LOG_ERR);
$arr['success'] = false;
if($task->getFailures() > 5)
$task->setDisabled(1);
else
$task->incFailures();
}
} elseif($mode == 'dryrun') {
$arr['success'] = true;

37
inc/inc.ClassSchedulerTask.php
View File

@ -90,7 +90,7 @@ class SeedDMS_SchedulerTask {
return null;
$row = $resArr[0];
$task = new self($row["id"], $row['name'], $row["description"], $row["extension"], $row["task"], $row["frequency"], $row['disabled'], json_decode($row['params'], true), $row["nextrun"], $row["lastrun"]);
$task = new self($row["id"], $row['name'], $row["description"], $row["extension"], $row["task"], $row["frequency"], $row['disabled'], json_decode($row['params'], true), $row["nextrun"], $row["lastrun"], $row["failures"]);
$task->setDB($db);
return $task;
@ -106,7 +106,7 @@ class SeedDMS_SchedulerTask {
$tasks = array();
foreach($resArr as $row) {
$task = new self($row["id"], $row['name'], $row["description"], $row["extension"], $row["task"], $row["frequency"], $row['disabled'], json_decode($row['params'], true), $row["nextrun"], $row["lastrun"]);
$task = new self($row["id"], $row['name'], $row["description"], $row["extension"], $row["task"], $row["frequency"], $row['disabled'], json_decode($row['params'], true), $row["nextrun"], $row["lastrun"], $row["failures"]);
$task->setDB($db);
$tasks[] = $task;
}
@ -124,7 +124,7 @@ class SeedDMS_SchedulerTask {
$tasks = array();
foreach($resArr as $row) {
$task = new self($row["id"], $row['name'], $row["description"], $row["extension"], $row["task"], $row["frequency"], $row['disabled'], json_decode($row['params'], true), $row["nextrun"], $row["lastrun"]);
$task = new self($row["id"], $row['name'], $row["description"], $row["extension"], $row["task"], $row["frequency"], $row['disabled'], json_decode($row['params'], true), $row["nextrun"], $row["lastrun"], $row["failures"]);
$task->setDB($db);
$tasks[] = $task;
}
@ -132,7 +132,7 @@ class SeedDMS_SchedulerTask {
return $tasks;
} /* }}} */
function __construct($id, $name, $description, $extension, $task, $frequency, $disabled, $params, $nextrun, $lastrun) {
function __construct($id, $name, $description, $extension, $task, $frequency, $disabled, $params, $nextrun, $lastrun, $failures) {
$this->_id = $id;
$this->_name = $name;
$this->_description = $description;
@ -143,6 +143,7 @@ class SeedDMS_SchedulerTask {
$this->_params = $params;
$this->_nextrun = $nextrun;
$this->_lastrun = $lastrun;
$this->_failures = $failures;
}
public function setDB($db) {
@ -225,6 +226,34 @@ class SeedDMS_SchedulerTask {
return $this->_lastrun;
}
public function getFailures() {
return $this->_failures;
}
public function resetFailures() { /* {{{ */
$db = $this->db;
$queryStr = "UPDATE `tblSchedulerTask` SET `failures` = 0 WHERE `id` = " . $this->_id;
$res = $db->getResult($queryStr);
if (!$res)
return false;
$this->_failures = 0;
return true;
} /* }}} */
public function incFailures() { /* {{{ */
$db = $this->db;
$queryStr = "UPDATE `tblSchedulerTask` SET `failures` = ".($this->_failures+1)." WHERE `id` = " . $this->_id;
$res = $db->getResult($queryStr);
if (!$res)
return false;
$this->_failures++;
return true;
} /* }}} */
public function getDisabled() {
return $this->_disabled;
}

1
install/create_tables-innodb.sql
View File

@ -1025,6 +1025,7 @@ CREATE TABLE `tblSchedulerTask` (
`params` text DEFAULT NULL,
`nextrun` datetime DEFAULT NULL,
`lastrun` datetime DEFAULT NULL,
`failures` int(11) DEFAULT '0',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

3
install/create_tables-postgres.sql
View File

@ -833,7 +833,8 @@ CREATE TABLE "tblSchedulerTask" (
"frequency" varchar(100) DEFAULT NULL,
"params" TEXT DEFAULT NULL,
"nextrun" TIMESTAMP DEFAULT NULL,
"lastrun" TIMESTAMP DEFAULT NULL
"lastrun" TIMESTAMP DEFAULT NULL,
"failures" INTEGER DEFAULT '0'
) ;
-- --------------------------------------------------------

3
install/create_tables-sqlite3.sql
View File

@ -842,7 +842,8 @@ CREATE TABLE `tblSchedulerTask` (
`frequency` varchar(100) DEFAULT NULL,
`params` TEXT DEFAULT NULL,
`nextrun` TEXT DEFAULT NULL,
`lastrun` TEXT DEFAULT NULL
`lastrun` TEXT DEFAULT NULL,
`failures` INTEGER DEFAULT '0'
) ;
-- --------------------------------------------------------

2
install/update-6.1.0/update-postgres.sql
View File

@ -24,6 +24,8 @@ ALTER TABLE "tblCategory" ADD COLUMN "color" char(8) default NULL;
ALTER TABLE "tblNotify" ADD COLUMN "inherit" INTEGER NOT NULL default '0';
ALTER TABLE "tblSchedulerTask" ADD COLUMN "failures" INTEGER NOT NULL default '0';
CREATE TABLE "tblAttributeDefinitionGroups" (
"id" SERIAL UNIQUE,
"name" varchar(100) default NULL,

2
install/update-6.1.0/update-sqlite3.sql
View File

@ -70,6 +70,8 @@ ALTER TABLE `tblCategory` ADD COLUMN `color` char(8) DEFAULT NULL;
ALTER TABLE `tblNotify` ADD COLUMN `inherit` INTEGER NOT NULL DEFAULT '0';
ALTER TABLE `tblSchedulerTask` ADD COLUMN `failures` INTEGER NOT NULL DEFAULT '0';
CREATE TABLE `tblAttributeDefinitionGroups` (
`id` INTEGER PRIMARY KEY AUTOINCREMENT,
`name` varchar(100) default NULL,

2
install/update-6.1.0/update.sql
View File

@ -24,6 +24,8 @@ ALTER TABLE `tblCategory` ADD COLUMN `color` char(8) DEFAULT NULL AFTER `name`;
ALTER TABLE `tblNotify` ADD COLUMN `inherit` smallint(1) NOT NULL DEFAULT '0';
ALTER TABLE `tblSchedulerTask` ADD COLUMN `failures` int(11) NOT NULL DEFAULT '0';
CREATE TABLE `tblAttributeDefinitionGroups` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`name` varchar(100) DEFAULT NULL,

2
views/bootstrap/class.SchedulerTaskMgr.php
View File

@ -563,6 +563,8 @@ $(document).ready( function() {
echo "<i class=\"fa fa-clock-o\" title=\"".getMLText('task_next_run')."\"></i> ".getLongReadableDate(makeTsFromDate($task->getNextRun()));
if($task->getLastRun())
echo "<br/><i class=\"fa fa-stop-circle\" title=\"".getMLText('task_last_run')."\"></i> ".getLongReadableDate(makeTsFromDate($task->getLastRun()));
if($task->getFailures())
echo "<br/><i class=\"fa fa-warning\" title=\"".getMLText('task_failures')."\"></i> ".$task->getFailures()." ".getMLText('task_failures');
echo "<br/><i class=\"fa fa-refresh\" title=\"".getMLText('task_frequency')."\"></i> ".$task->getFrequency();
echo "</td>";
echo "<td nowrap>";