Skip to content

Don't always read logs in case of exception #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: 0.7.x
Choose a base branch
from
Open

Don't always read logs in case of exception #149

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2a6f83f
Don't always read logs in case of exception
vermakhushboo Mar 19, 2025
030672c
Throw exception for empty build
vermakhushboo Mar 19, 2025
dc36d81
Add version check
vermakhushboo Mar 19, 2025
d54c8cd
Remove empty check for now
vermakhushboo Mar 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/http.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,7 @@ function cleanUp(Orchestration $orchestration, Table $activeRuntimes, array $net
$tmpBuild = "/{$tmpFolder}builds/code.tar.gz";
$tmpLogging = "/{$tmpFolder}logging"; // Build logs
$tmpLogs = "/{$tmpFolder}logs"; // Runtime logs
$tmpBuildOutput = "/{$tmpFolder}buildOutput"; // Build output

$sourceDevice = getStorageDevice("/");
$localDevice = new Local();
Expand Down Expand Up @@ -704,6 +705,7 @@ function cleanUp(Orchestration $orchestration, Table $activeRuntimes, array $net
if ($version === 'v5') {
$volumes[] = \dirname($tmpLogs . '/logs') . ':/mnt/logs:rw';
$volumes[] = \dirname($tmpLogging . '/logging') . ':/tmp/logging:rw';
$volumes[] = \dirname($tmpBuildOutput) . ':/usr/local/build:rw';
}

/** Keep the container alive if we have commands to be executed */
Expand Down Expand Up @@ -766,6 +768,10 @@ function cleanUp(Orchestration $orchestration, Table $activeRuntimes, array $net
];
}
} catch (Throwable $err) {
if ($version !== 'v2') {
$output = Logs::get($runtimeName);
}

throw new Exception($err->getMessage(), 400);
}
}
Expand Down Expand Up @@ -833,12 +839,6 @@ function cleanUp(Orchestration $orchestration, Table $activeRuntimes, array $net
'timestamp' => Logs::getTimestamp(),
'content' => $message
];
} else {
$output = Logs::get($runtimeName);
$output = \count($output) > 0 ? $output : [
'timestamp' => Logs::getTimestamp(),
'content' => $th->getMessage()
];
}

$localDevice->deletePath($tmpFolder);
Expand Down
Loading