dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Refactor handleError function to handle ModelNotFoundException

Browse Source
This commit is contained in:
Andras Bacsai
2024-10-17 21:48:47 +02:00
parent df4e4c2b4e
commit bfa9a8776e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bootstrap/helpers/shared.php
View File

@@ -142,6 +142,10 @@ function handleError(?Throwable $error = null, ?Livewire\Component $livewire = n
return 'Duplicate entry found. Please use a different name.'; return 'Duplicate entry found. Please use a different name.';
} }
if ($error instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
abort(404);
}
if ($error instanceof Throwable) { if ($error instanceof Throwable) {
$message = $error->getMessage(); $message = $error->getMessage();
} else { } else {
@@ -3983,13 +3987,14 @@ function instanceSettings()
return InstanceSettings::get(); return InstanceSettings::get();
} }
function loadConfigFromGit(string $repository, string $branch, string $base_directory, int $server_id, int $team_id) { function loadConfigFromGit(string $repository, string $branch, string $base_directory, int $server_id, int $team_id)
{
$server = Server::find($server_id)->where('team_id', $team_id)->first(); $server = Server::find($server_id)->where('team_id', $team_id)->first();
if (!$server) { if (! $server) {
return; return;
} }
$uuid = new Cuid2(); $uuid = new Cuid2;
$cloneCommand = "git clone --no-checkout -b $branch $repository ."; $cloneCommand = "git clone --no-checkout -b $branch $repository .";
$workdir = rtrim($base_directory, '/'); $workdir = rtrim($base_directory, '/');
$fileList = collect([".$workdir/coolify.json"]); $fileList = collect([".$workdir/coolify.json"]);
@@ -4007,13 +4012,13 @@ function loadConfigFromGit(string $repository, string $branch, string $base_dire
try { try {
return instant_remote_process($commands, $server); return instant_remote_process($commands, $server);
} catch (\Exception $e) { } catch (\Exception $e) {
// continue // continue
} }
} }
function loggy($message = null, array $context = []) function loggy($message = null, array $context = [])
{ {
if (!isDev()) { if (! isDev()) {
return; return;
} }
if (function_exists('ray') && config('app.debug')) { if (function_exists('ray') && config('app.debug')) {