CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-26 18:20:43 +12:00
Code Issues Projects Releases Wiki Activity

Implement UNIX Exit Code suggestion

Browse source
This commit is contained in:
Bradley Schofield 2021-08-11 14:23:37 +01:00
parent 1a8bed396a
commit 80fef728b4
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/workers/functions.php
View file

@ -440,7 +440,7 @@ class FunctionsV1 extends Worker
$exitCode = 0;
try {
$exitCode = $orchestration->execute(
$exitCode = (int)!$orchestration->execute(
name: $container,
command: $orchestration->parseCommandString($command),
stdout: $stdout,
@ -448,12 +448,12 @@ class FunctionsV1 extends Worker
vars: $vars,
timeout: $function->getAttribute('timeout', (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900)));
} catch (TimeoutException $e) {
$exitCode = 0;
$exitCode = 124;
}
$executionEnd = \microtime(true);
$executionTime = ($executionEnd - $executionStart);
$functionStatus = $exitCode ? 'completed' : 'failed';
$functionStatus = ($exitCode === 0) ? 'completed' : 'failed';
Console::info('Function executed in ' . ($executionEnd - $executionStart) . ' seconds, status: ' . $functionStatus);
@ -462,7 +462,7 @@ class FunctionsV1 extends Worker
$execution = $database->updateDocument(array_merge($execution->getArrayCopy(), [
'tagId' => $tag->getId(),
'status' => $functionStatus,
'exitCode' => ($exitCode ? 0 : 1),
'exitCode' => ($exitCode === 0 ? 0 : 1),
'stdout' => \mb_substr($stdout, -4000), // log last 4000 chars output
'stderr' => \mb_substr($stderr, -4000), // log last 4000 chars output
'time' => $executionTime

8
composer.lock generated
View file

@ -1913,12 +1913,12 @@
"source": {
"type": "git",
"url": "https://github.com/PineappleIOnic/orchestration.git",
"reference": "d19c498731807aaadf583c58356011c8f39c53cf"
"reference": "213d8796cd3b4a23b8d3728227b0e8ab1ceb4aea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/PineappleIOnic/orchestration/zipball/d19c498731807aaadf583c58356011c8f39c53cf",
"reference": "d19c498731807aaadf583c58356011c8f39c53cf",
"url": "https://api.github.com/repos/PineappleIOnic/orchestration/zipball/213d8796cd3b4a23b8d3728227b0e8ab1ceb4aea",
"reference": "213d8796cd3b4a23b8d3728227b0e8ab1ceb4aea",
"shasum": ""
},
"require": {
@ -1963,7 +1963,7 @@
"support": {
"source": "https://github.com/PineappleIOnic/orchestration/tree/dev"
},
"time": "2021-08-11T10:38:19+00:00"
"time": "2021-08-11T12:45:16+00:00"
},
{
"name": "utopia-php/preloader",