CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-10-01 17:58:02 +13:00
Code Issues Projects Releases Wiki Activity

Minor code refactoring

Browse source
This commit is contained in:
Eldad A. Fux 2019-11-25 22:25:54 +02:00 committed by GitHub
parent 2449a74d93
commit bae5407143
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/workers/tasks.php
View file

@ -23,7 +23,7 @@ class TasksV1
public function perform() public function perform()
{ {
global $consoleDB, $register, $version; global $consoleDB, $version;
/* /*
* 1. Get Original Task * 1. Get Original Task
@ -44,6 +44,9 @@ class TasksV1
$delay = time() - $next; $delay = time() - $next;
$errors = []; $errors = [];
$timeout = 60 * 5; // 5 minutes $timeout = 60 * 5; // 5 minutes
$errorLimit = 5;
$logLimit = 5;
$alert = '';
if (empty($taskId)) { if (empty($taskId)) {
throw new Exception('Missing task $id'); throw new Exception('Missing task $id');
@ -78,7 +81,7 @@ class TasksV1
->setAttribute('previous', time()) ->setAttribute('previous', time())
; ;
ResqueScheduler::enqueueAt($next, 'v1-tasks', 'TasksV1', $task->getArrayCopy()); ResqueScheduler::enqueueAt($next, 'v1-tasks', 'TasksV1', $task->getArrayCopy()); // Async task rescheduale
$startTime = microtime(true); $startTime = microtime(true);
@ -147,15 +150,15 @@ class TasksV1
} else { } else {
$task $task
->setAttribute('failures', $task->getAttribute('failures', 0) + 1) ->setAttribute('failures', $task->getAttribute('failures', 0) + 1)
->setAttribute('status', ($task->getAttribute('failures') >= 5) ? 'pause' : 'play') ->setAttribute('status', ($task->getAttribute('failures') >= $errorLimit) ? 'pause' : 'play')
; ;
$alert = 'Task "'.$task->getAttribute('name').'" failed to execute with the following errors: '.implode($errors, "\n"); $alert = 'Task "'.$task->getAttribute('name').'" failed to execute with the following errors: '.implode("\n", $errors);
} }
$log = json_decode($task->getAttribute('log', '{}'), true); $log = json_decode($task->getAttribute('log', '{}'), true);
if (count($log) >= 5) { if (count($log) >= $logLimit) {
array_pop($log); array_pop($log);
} }
@ -182,6 +185,10 @@ class TasksV1
Authorization::enable(); Authorization::enable();
// ResqueScheduler::enqueueAt($next, 'v1-tasks', 'TasksV1', $task->getArrayCopy()); // Sync task rescheduale
// Send alert if needed (use SMTP as default for now)
return true; return true;
} }