fix: errors

This commit is contained in:
Andras Bacsai
2023-09-11 17:36:30 +02:00
parent 16c71f3647
commit 64a65e2018
67 changed files with 156 additions and 147 deletions

View File

@@ -52,7 +52,7 @@ function format_docker_envs_to_json($rawOutput)
$env = explode('=', $env);
return [$env[0] => $env[1]];
});
} catch (\Throwable $th) {
} catch (\Throwable $e) {
return collect([]);
}
}

View File

@@ -203,7 +203,7 @@ function validateServer(Server $server)
"uptime" => $uptime,
"dockerVersion" => $dockerVersion,
];
} catch (\Exception $e) {
} catch (\Throwable $e) {
$server->settings->is_reachable = false;
$server->settings->is_usable = false;
throw $e;
@@ -219,7 +219,7 @@ function check_server_connection(Server $server)
instant_remote_process(['uptime'], $server);
$server->unreachable_count = 0;
$server->settings->is_reachable = true;
} catch (\Exception $e) {
} catch (\Throwable $e) {
if ($server->unreachable_count == 2) {
$server->team->notify(new NotReachable($server));
$server->settings->is_reachable = false;
@@ -246,7 +246,7 @@ function checkRequiredCommands(Server $server)
}
try {
instant_remote_process(["docker run --rm --privileged --net=host --pid=host --ipc=host --volume /:/host busybox chroot /host bash -c 'apt update && apt install -y {$command}'"], $server);
} catch (\Exception $e) {
} catch (\Throwable $e) {
ray('could not install ' . $command);
ray($e);
break;

View File

@@ -89,18 +89,18 @@ function general_error_handler(Throwable | null $err = null, $that = null, $isJs
}
throw new Exception($customErrorMessage ?? $err->getMessage());
}
} catch (Throwable $error) {
} catch (Throwable $e) {
if ($that) {
return $that->emit('error', $customErrorMessage ?? $error->getMessage());
return $that->emit('error', $customErrorMessage ?? $e->getMessage());
} elseif ($isJson) {
return response()->json([
'code' => $error->getCode(),
'error' => $error->getMessage(),
'code' => $e->getCode(),
'error' => $e->getMessage(),
]);
} else {
ray($customErrorMessage);
ray($error);
return $customErrorMessage ?? $error->getMessage();
ray($e);
return $customErrorMessage ?? $e->getMessage();
}
}
}
@@ -116,9 +116,9 @@ function get_latest_version_of_coolify(): string
$response = Http::get('https://cdn.coollabs.io/coolify/versions.json');
$versions = $response->json();
return data_get($versions, 'coolify.v4.version');
} catch (Throwable $th) {
//throw $th;
ray($th->getMessage());
} catch (Throwable $e) {
//throw $e;
ray($e->getMessage());
return '0.0.0';
}
}
@@ -258,8 +258,8 @@ function send_internal_notification(string $message): void
$baseUrl = config('app.name');
$team = Team::find(0);
$team->notify(new GeneralNotification("👀 {$baseUrl}: " . $message));
} catch (\Throwable $th) {
ray($th->getMessage());
} catch (\Throwable $e) {
ray($e->getMessage());
}
}
function send_user_an_email(MailMessage $mail, string $email): void