Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: errors

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Actions/CoolifyTask/RunRemoteProcess.php
View File

@ -97,7 +97,6 @@ public function __invoke(): ProcessResult
'status' => $status->value,
]);
$this->activity->save();
if ($processResult->exitCode() != 0 && !$this->ignore_errors) {
throw new \RuntimeException($processResult->errorOutput());
}

6
app/Actions/License/CheckResaleLicense.php
View File

@ -57,13 +57,13 @@ public function __invoke()
throw new \Exception('Invalid license key.');
}
throw new \Exception('Cannot activate license key.');
} catch (\Throwable $th) {
ray($th);
} catch (\Throwable $e) {
ray($e);
$settings->update([
'resale_license' => null,
'is_resale_license_active' => false,
]);
throw $th;
throw $e;
}
}
}

4
app/Actions/Proxy/SaveConfigurationSync.php
View File

@ -20,8 +20,8 @@ public function __invoke(Server $server, string $configuration)
"mkdir -p $proxy_path",
"echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml",
], $server);
} catch (\Throwable $th) {
ray($th);
} catch (\Throwable $e) {
ray($e);
}
}

8
app/Actions/Server/UpdateCoolify.php
View File

@ -43,11 +43,11 @@ public function __invoke(bool $force)
$this->update();
}
send_internal_notification('InstanceAutoUpdateJob done to version: ' . $this->latestVersion . ' from version: ' . $this->currentVersion);
} catch (\Exception $th) {
} catch (\Throwable $e) {
ray('InstanceAutoUpdateJob failed');
ray($th->getMessage());
send_internal_notification('InstanceAutoUpdateJob failed: ' . $th->getMessage());
throw $th;
ray($e->getMessage());
send_internal_notification('InstanceAutoUpdateJob failed: ' . $e->getMessage());
throw $e;
}
}

2
app/Console/Commands/Init.php
View File

@ -26,7 +26,7 @@ private function cleanup_in_progress_application_deployments()
$deployment->status = ApplicationDeploymentStatus::FAILED->value;
$deployment->save();
}
} catch (\Exception $e) {
} catch (\Throwable $e) {
echo "Error: {$e->getMessage()}\n";
}
}

2
app/Console/Commands/SyncBunny.php
View File

@ -82,7 +82,7 @@ public function handle()
$pool->purge("$bunny_cdn/$bunny_cdn_path/$versions"),
]);
echo "All files uploaded & purged...\n";
} catch (\Exception $e) {
} catch (\Throwable $e) {
echo $e->getMessage();
}
}

2
app/Exceptions/Handler.php
View File

@ -25,7 +25,7 @@ class Handler extends ExceptionHandler
* @var array<int, class-string<\Throwable>>
*/
protected $dontReport = [
//
ProcessException::class
];
/**
* A list of the inputs that are never flashed to the session on validation exceptions.

10
app/Exceptions/ProcessException.php Normal file
View File

@ -0,0 +1,10 @@
<?php
namespace App\Exceptions;
use Exception;
class ProcessException extends Exception
{
}

8
app/Http/Controllers/Controller.php
View File

@ -154,8 +154,8 @@ public function acceptInvitation()
$invitation->delete();
abort(401);
}
} catch (Throwable $th) {
throw $th;
} catch (Throwable $e) {
throw $e;
}
}
@ -172,8 +172,8 @@ public function revokeInvitation()
}
$invitation->delete();
return redirect()->route('team.index');
} catch (Throwable $th) {
throw $th;
} catch (Throwable $e) {
throw $e;
}
}
}

2
app/Http/Livewire/Boarding/Index.php
View File

@ -193,7 +193,7 @@ public function validateServer() {
}
$this->getProxyType();
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(customErrorMessage: "Server is not reachable. Reason: {$e->getMessage()}", that: $this);
}
}

6
app/Http/Livewire/CheckLicense.php
View File

@ -34,9 +34,9 @@ public function submit()
try {
resolve(CheckResaleLicense::class)();
$this->emit('reloadWindow');
} catch (\Throwable $th) {
session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $th->getMessage());
ray($th->getMessage());
} catch (\Throwable $e) {
session()->flash('error', 'Something went wrong. Please contact support. <br>Error: ' . $e->getMessage());
ray($e->getMessage());
return redirect()->to('/settings/license');
}
}

2
app/Http/Livewire/Destination/Form.php
View File

@ -37,7 +37,7 @@ public function delete()
}
$this->destination->delete();
return redirect()->route('dashboard');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e);
}
}

2
app/Http/Livewire/Destination/New/StandaloneDocker.php
View File

@ -71,7 +71,7 @@ public function submit()
}
$this->createNetworkAndAttachToProxy();
return redirect()->route('destination.show', $docker->uuid);
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

2
app/Http/Livewire/ForcePasswordReset.php
View File

@ -36,7 +36,7 @@ public function submit()
send_internal_notification('First login for ' . auth()->user()->email);
}
return redirect()->route('dashboard');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

2
app/Http/Livewire/Help.php
View File

@ -43,7 +43,7 @@ public function submit()
$mail->subject("[HELP - {$subscriptionType}]: {$this->subject}");
send_user_an_email($mail, 'hi@coollabs.io');
$this->emit('success', 'Your message has been sent successfully. We will get in touch with you as soon as possible.');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}

2
app/Http/Livewire/Notifications/DiscordSettings.php
View File

@ -29,7 +29,7 @@ public function instantSave()
{
try {
$this->submit();
} catch (\Exception $e) {
} catch (\Throwable $e) {
ray($e->getMessage());
$this->team->discord_enabled = false;
$this->validate();

12
app/Http/Livewire/Notifications/EmailSettings.php
View File

@ -63,7 +63,7 @@ public function submitFromFields()
]);
$this->team->save();
$this->emit('success', 'Settings saved successfully.');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}
@ -82,7 +82,7 @@ public function instantSaveInstance()
$this->team->resend_enabled = false;
$this->team->save();
$this->emit('success', 'Settings saved successfully.');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}
@ -92,7 +92,7 @@ public function instantSaveResend()
try {
$this->team->smtp_enabled = false;
$this->submitResend();
} catch (\Exception $e) {
} catch (\Throwable $e) {
$this->team->smtp_enabled = false;
return general_error_handler($e, $this);
}
@ -102,7 +102,7 @@ public function instantSave()
try {
$this->team->resend_enabled = false;
$this->submit();
} catch (\Exception $e) {
} catch (\Throwable $e) {
$this->team->smtp_enabled = false;
return general_error_handler($e, $this);
}
@ -131,7 +131,7 @@ public function submit()
]);
$this->team->save();
$this->emit('success', 'Settings saved successfully.');
} catch (\Exception $e) {
} catch (\Throwable $e) {
$this->team->smtp_enabled = false;
return general_error_handler($e, $this);
}
@ -146,7 +146,7 @@ public function submitResend()
$this->team->save();
refreshSession();
$this->emit('success', 'Settings saved successfully.');
} catch (\Exception $e) {
} catch (\Throwable $e) {
$this->team->resend_enabled = false;
return general_error_handler($e, $this);
}

2
app/Http/Livewire/Notifications/TelegramSettings.php
View File

@ -35,7 +35,7 @@ public function instantSave()
{
try {
$this->submit();
} catch (\Exception $e) {
} catch (\Throwable $e) {
ray($e->getMessage());
$this->team->telegram_enabled = false;
$this->validate();

4
app/Http/Livewire/PrivateKey/Change.php
View File

@ -38,7 +38,7 @@ public function delete()
return redirect()->route('security.private-key.index');
}
$this->emit('error', 'This private key is in use and cannot be deleted. Please delete all servers, applications, and GitHub/GitLab apps that use this private key before deleting it.');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}
@ -49,7 +49,7 @@ public function changePrivateKey()
$this->private_key->private_key = formatPrivateKey($this->private_key->private_key);
$this->private_key->save();
refresh_server_connection($this->private_key);
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

2
app/Http/Livewire/PrivateKey/Create.php
View File

@ -38,7 +38,7 @@ public function createPrivateKey()
return redirect()->route('server.create');
}
return redirect()->route('security.private-key.show', ['private_key_uuid' => $private_key->uuid]);
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

2
app/Http/Livewire/Project/AddEmpty.php
View File

@ -28,7 +28,7 @@ public function submit()
'team_id' => currentTeam()->id,
]);
return redirect()->route('project.show', $project->uuid);
} catch (\Exception $e) {
} catch (\Throwable $e) {
general_error_handler($e, $this);
} finally {
$this->name = '';

2
app/Http/Livewire/Project/AddEnvironment.php
View File

@ -31,7 +31,7 @@ public function submit()
'project_uuid' => $this->project->uuid,
'environment_name' => $environment->name,
]);
} catch (\Exception $e) {
} catch (\Throwable $e) {
general_error_handler($e, $this);
} finally {
$this->name = '';

2
app/Http/Livewire/Project/Application/General.php
View File

@ -161,7 +161,7 @@ public function submit()
}
$this->application->save();
$this->emit('success', 'Application settings updated!');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

4
app/Http/Livewire/Project/Database/BackupEdit.php
View File

@ -51,7 +51,7 @@ public function instantSave()
$this->backup->save();
$this->backup->refresh();
$this->emit('success', 'Backup updated successfully');
} catch (\Exception $e) {
} catch (\Throwable $e) {
$this->emit('error', $e->getMessage());
}
}
@ -76,7 +76,7 @@ public function submit()
$this->backup->save();
$this->backup->refresh();
$this->emit('success', 'Backup updated successfully');
} catch (\Exception $e) {
} catch (\Throwable $e) {
$this->emit('error', $e->getMessage());
}
}

2
app/Http/Livewire/Project/Database/CreateScheduledBackup.php
View File

@ -42,7 +42,7 @@ public function submit(): void
'team_id' => currentTeam()->id,
]);
$this->emit('refreshScheduledBackups');
} catch (\Exception $e) {
} catch (\Throwable $e) {
general_error_handler($e, $this);
} finally {
$this->frequency = '';

2
app/Http/Livewire/Project/Edit.php
View File

@ -19,7 +19,7 @@ public function submit()
try {
$this->project->save();
$this->emit('saved');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}

2
app/Http/Livewire/Project/New/GithubPrivateRepository.php
View File

@ -164,7 +164,7 @@ public function submit()
'environment_name' => $environment->name,
'project_uuid' => $project->uuid,
]);
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

2
app/Http/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php
View File

@ -117,7 +117,7 @@ public function submit()
'environment_name' => $environment->name,
'application_uuid' => $application->uuid,
]);
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

6
app/Http/Livewire/Project/New/PublicGitRepository.php
View File

@ -75,14 +75,14 @@ public function load_branch()
$this->get_git_source();
$this->get_branch();
$this->selected_branch = $this->git_branch;
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
if (!$this->branch_found && $this->git_branch == 'main') {
try {
$this->git_branch = 'master';
$this->get_branch();
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}
@ -161,7 +161,7 @@ public function submit()
'environment_name' => $environment->name,
'application_uuid' => $application->uuid,
]);
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

2
app/Http/Livewire/Project/New/Select.php
View File

@ -40,7 +40,7 @@ public function mount()
// try {
// instantCommand("psql {$this->existingPostgresqlUrl} -c 'SELECT 1'");
// $this->emit('success', 'Successfully connected to the database.');
// } catch (\Exception $e) {
// } catch (\Throwable $e) {
// return general_error_handler($e, $this);
// }
// }

2
app/Http/Livewire/Project/Shared/EnvironmentVariable/All.php
View File

@ -108,7 +108,7 @@ public function submit($data)
$environment->save();
$this->refreshEnvs();
$this->emit('success', 'Environment variable added successfully.');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

2
app/Http/Livewire/Project/Shared/ResourceLimits.php
View File

@ -53,7 +53,7 @@ public function submit()
$this->validate();
$this->resource->save();
$this->emit('success', 'Resource limits updated successfully.');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

2
app/Http/Livewire/Project/Shared/Storages/All.php
View File

@ -28,7 +28,7 @@ public function submit($data)
$this->resource->refresh();
$this->emit('success', 'Storage added successfully');
$this->emit('clearAddStorage');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

2
app/Http/Livewire/RunCommand.php
View File

@ -32,7 +32,7 @@ public function runCommand()
try {
$activity = remote_process([$this->command], Server::where('uuid', $this->server)->first(), ignore_errors: true);
$this->emit('newMonitorActivity', $activity->id);
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e);
}
}

4
app/Http/Livewire/Server/Form.php
View File

@ -66,7 +66,7 @@ public function validateServer()
} else {
$this->emit('error', 'Old (lower than 23) or no Docker version detected. Install Docker Engine on the General tab.');
}
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler($e, that: $this);
}
}
@ -81,7 +81,7 @@ public function delete()
}
$this->server->delete();
return redirect()->route('server.all');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

2
app/Http/Livewire/Server/New/ByIp.php
View File

@ -78,7 +78,7 @@ public function submit()
$server->settings->is_part_of_swarm = $this->is_part_of_swarm;
$server->settings->save();
return redirect()->route('server.show', $server->uuid);
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e);
}
}

6
app/Http/Livewire/Server/Proxy.php
View File

@ -55,7 +55,7 @@ public function submit()
setup_default_redirect_404(redirect_url: $this->server->proxy->redirect_url, server: $this->server);
$this->emit('success', 'Proxy configuration saved.');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e);
}
}
@ -64,7 +64,7 @@ public function reset_proxy_configuration()
{
try {
$this->proxy_settings = resolve(CheckConfigurationSync::class)($this->server, true);
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e);
}
}
@ -73,7 +73,7 @@ public function load_proxy_configuration()
{
try {
$this->proxy_settings = resolve(CheckConfigurationSync::class)($this->server);
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e);
}
}

4
app/Http/Livewire/Server/ShowPrivateKey.php
View File

@ -21,7 +21,7 @@ public function setPrivateKey($newPrivateKeyId)
$this->server->refresh();
refresh_server_connection($this->server->privateKey);
$this->checkConnection();
} catch (\Exception $e) {
} catch (\Throwable $e) {
$this->server->update([
'private_key_id' => $oldPrivateKeyId
]);
@ -46,7 +46,7 @@ public function checkConnection()
} else {
$this->emit('error', 'Old (lower than 23) or no Docker version detected. Install Docker Engine on the General tab.');
}
} catch (\Exception $e) {
} catch (\Throwable $e) {
throw new \Exception($e->getMessage());
}
}

10
app/Http/Livewire/Settings/Email.php
View File

@ -50,7 +50,7 @@ public function submitFromFields() {
]);
$this->settings->save();
$this->emit('success', 'Settings saved successfully.');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}
@ -62,7 +62,7 @@ public function submitResend() {
]);
$this->settings->save();
$this->emit('success', 'Settings saved successfully.');
} catch (\Exception $e) {
} catch (\Throwable $e) {
$this->settings->resend_enabled = false;
return general_error_handler($e, $this);
}
@ -71,7 +71,7 @@ public function instantSaveResend() {
try {
$this->settings->smtp_enabled = false;
$this->submitResend();
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}
@ -80,7 +80,7 @@ public function instantSave()
try {
$this->settings->resend_enabled = false;
$this->submit();
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}
@ -99,7 +99,7 @@ public function submit()
]);
$this->settings->save();
$this->emit('success', 'Settings saved successfully.');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}

4
app/Http/Livewire/Source/Github/Change.php
View File

@ -51,7 +51,7 @@ public function submit()
try {
$this->validate();
$this->github_app->save();
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}
@ -65,7 +65,7 @@ public function delete()
try {
$this->github_app->delete();
redirect()->route('source.all');
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

2
app/Http/Livewire/Source/Github/Create.php
View File

@ -49,7 +49,7 @@ public function createGitHubApp()
session(['from' => session('from') + ['source_id' => $github_app->id]]);
}
redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

4
app/Http/Livewire/Subscription/Actions.php
View File

@ -30,7 +30,7 @@ public function cancel()
$this->emit('success', 'Subscription cancelled successfully. Reloading in 5s.');
$this->emit('reloadWindow', 5000);
}
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}
@ -65,7 +65,7 @@ public function resume()
$this->emit('success', 'Subscription resumed successfully. Reloading in 5s.');
$this->emit('reloadWindow', 5000);
}
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}

4
app/Http/Livewire/Team/Create.php
View File

@ -31,8 +31,8 @@ public function submit()
auth()->user()->teams()->attach($team, ['role' => 'admin']);
refreshSession();
return redirect()->route('team.index');
} catch (\Throwable $th) {
return general_error_handler($th, $this);
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}
}

4
app/Http/Livewire/Team/Form.php
View File

@ -28,8 +28,8 @@ public function submit()
try {
$this->team->save();
refreshSession();
} catch (\Throwable $th) {
return general_error_handler($th, $this);
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}
}

8
app/Http/Livewire/Team/Storage/Create.php
View File

@ -67,8 +67,8 @@ public function submit()
$this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
$this->storage->save();
return redirect()->route('team.storages.show', $this->storage->uuid);
} catch (\Throwable $th) {
return general_error_handler($th, $this);
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}
@ -77,8 +77,8 @@ private function test_s3_connection()
try {
$this->storage->testConnection();
return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
} catch (\Throwable $th) {
return general_error_handler($th, $this);
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}
}

12
app/Http/Livewire/Team/Storage/Form.php
View File

@ -32,8 +32,8 @@ public function test_s3_connection()
try {
$this->storage->testConnection();
return $this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
} catch (\Throwable $th) {
return general_error_handler($th, $this);
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}
@ -42,8 +42,8 @@ public function delete()
try {
$this->storage->delete();
return redirect()->route('team.storages.all');
} catch (\Throwable $th) {
return general_error_handler($th, $this);
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}
@ -55,8 +55,8 @@ public function submit()
$this->emit('success', 'Connection is working. Tested with "ListObjectsV2" action.');
$this->storage->save();
$this->emit('success', 'Storage settings saved.');
} catch (\Throwable $th) {
return general_error_handler($th, $this);
} catch (\Throwable $e) {
return general_error_handler($e, $this);
}
}
}

2
app/Http/Livewire/Upgrade.php
View File

@ -37,7 +37,7 @@ public function upgrade()
$this->showProgress = true;
resolve(UpdateCoolify::class)(true);
Toaster::success("Upgrading to {$this->latestVersion} version...");
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

2
app/Http/Livewire/Waitlist/Index.php
View File

@ -52,7 +52,7 @@ public function submit()
$this->emit('success', 'Check your email to verify your email address.');
dispatch(new SendConfirmationForWaitlistJob($this->email, $waitlist->uuid));
} catch (\Exception $e) {
} catch (\Throwable $e) {
return general_error_handler(err: $e, that: $this);
}
}

6
app/Jobs/ApplicationContainerStatusJob.php
View File

@ -46,9 +46,9 @@ public function handle(): void
$this->application->status = $status;
$this->application->save();
}
} catch (\Exception $th) {
ray($th->getMessage());
throw $th;
} catch (\Throwable $e) {
ray($e->getMessage());
throw $e;
}
}
}

2
app/Jobs/ApplicationPullRequestUpdateJob.php
View File

@ -57,7 +57,7 @@ public function handle()
} else {
$this->create_comment();
}
} catch (\Exception $e) {
} catch (\Throwable $e) {
ray($e);
throw $e;
}

8
app/Jobs/CheckResaleLicenseJob.php
View File

@ -21,10 +21,10 @@ public function handle(): void
{
try {
resolve(CheckResaleLicense::class)();
} catch (\Throwable $th) {
send_internal_notification('CheckResaleLicenseJob failed with: ' . $th->getMessage());
ray($th);
throw $th;
} catch (\Throwable $e) {
send_internal_notification('CheckResaleLicenseJob failed with: ' . $e->getMessage());
ray($e);
throw $e;
}
}
}

2
app/Jobs/CleanupInstanceStuffsJob.php
View File

@ -28,7 +28,7 @@ public function handle(): void
{
try {
// $this->cleanup_waitlist();
} catch (\Exception $e) {
} catch (\Throwable $e) {
send_internal_notification('CleanupInstanceStuffsJob failed with error: ' . $e->getMessage());
ray($e->getMessage());
throw $e;

20
app/Jobs/DatabaseBackupJob.php
View File

@ -90,10 +90,10 @@ public function handle(): void
}
$this->save_backup_logs();
// TODO: Notify user
} catch (\Throwable $th) {
ray($th->getMessage());
send_internal_notification('DatabaseBackupJob failed with: ' . $th->getMessage());
throw $th;
} catch (\Throwable $e) {
ray($e->getMessage());
send_internal_notification('DatabaseBackupJob failed with: ' . $e->getMessage());
throw $e;
}
}
@ -116,10 +116,10 @@ private function backup_standalone_postgresql(): void
$this->backup_status = 'success';
$this->team->notify(new BackupSuccess($this->backup, $this->database));
} catch (Throwable $th) {
} catch (Throwable $e) {
$this->backup_status = 'failed';
$this->add_to_backup_output($th->getMessage());
ray('Backup failed for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location . '\n\nError:' . $th->getMessage());
$this->add_to_backup_output($e->getMessage());
ray('Backup failed for ' . $this->container_name . ' at ' . $this->server->name . ':' . $this->backup_location . '\n\nError:' . $e->getMessage());
$this->team->notify(new BackupFailed($this->backup, $this->database, $this->backup_output));
} finally {
$this->backup_log->update([
@ -173,9 +173,9 @@ private function upload_to_s3(): void
instant_remote_process($commands, $this->server);
$this->add_to_backup_output('Uploaded to S3.');
ray('Uploaded to S3. ' . $this->backup_location . ' to s3://' . $bucket . $this->backup_dir);
} catch (\Throwable $th) {
$this->add_to_backup_output($th->getMessage());
ray($th->getMessage());
} catch (\Throwable $e) {
$this->add_to_backup_output($e->getMessage());
ray($e->getMessage());
} finally {
$command = "docker rm -f backup-of-{$this->backup->uuid}";
instant_remote_process([$command], $this->server);

2
app/Jobs/DatabaseContainerStatusJob.php
View File

@ -47,7 +47,7 @@ public function handle(): void
$this->database->status = $status;
$this->database->save();
}
} catch (\Exception $e) {
} catch (\Throwable $e) {
send_internal_notification('DatabaseContainerStatusJob failed with: ' . $e->getMessage());
ray($e->getMessage());
throw $e;

2
app/Jobs/DockerCleanupJob.php
View File

@ -75,7 +75,7 @@ public function handle(): void
ray('No need to clean up ' . $server->name)->color('orange');
}
}
} catch (\Exception $e) {
} catch (\Throwable $e) {
send_internal_notification('DockerCleanupJob failed with: ' . $e->getMessage());
ray($e->getMessage())->color('orange');
throw $e;

8
app/Jobs/ProxyCheckJob.php
View File

@ -37,10 +37,10 @@ public function handle()
resolve(StartProxy::class)($server);
}
}
} catch (\Throwable $th) {
ray($th->getMessage());
send_internal_notification('ProxyCheckJob failed with: ' . $th->getMessage());
throw $th;
} catch (\Throwable $e) {
ray($e->getMessage());
send_internal_notification('ProxyCheckJob failed with: ' . $e->getMessage());
throw $e;
}
}
}

2
app/Jobs/ProxyContainerStatusJob.php
View File

@ -52,7 +52,7 @@ public function handle(): void
}
$this->server->save();
}
} catch (\Exception $e) {
} catch (\Throwable $e) {
if ($e->getCode() === 1) {
$this->server->proxy->status = 'exited';
$this->server->save();

8
app/Jobs/ProxyStartJob.php
View File

@ -35,10 +35,10 @@ public function handle()
$this->server->save();
}
resolve(StartProxy::class)($this->server);
} catch (\Throwable $th) {
send_internal_notification('ProxyStartJob failed with: ' . $th->getMessage());
ray($th->getMessage());
throw $th;
} catch (\Throwable $e) {
send_internal_notification('ProxyStartJob failed with: ' . $e->getMessage());
ray($e->getMessage());
throw $e;
}
}
}

8
app/Jobs/ResourceStatusJob.php
View File

@ -37,10 +37,10 @@ public function handle(): void
database: $postgresql,
));
}
} catch (\Exception $th) {
send_internal_notification('ResourceStatusJob failed with: ' . $th->getMessage());
ray($th);
throw $th;
} catch (\Throwable $e) {
send_internal_notification('ResourceStatusJob failed with: ' . $e->getMessage());
ray($e);
throw $e;
}
}
}

8
app/Jobs/SendConfirmationForWaitlistJob.php
View File

@ -34,10 +34,10 @@ public function handle()
]);
$mail->subject('You are on the waitlist!');
send_user_an_email($mail, $this->email);
} catch (\Throwable $th) {
send_internal_notification("SendConfirmationForWaitlistJob failed for {$this->email} with error: " . $th->getMessage());
ray($th->getMessage());
throw $th;
} catch (\Throwable $e) {
send_internal_notification("SendConfirmationForWaitlistJob failed for {$this->email} with error: " . $e->getMessage());
ray($e->getMessage());
throw $e;
}
}
}

8
app/Jobs/SubscriptionInvoiceFailedJob.php
View File

@ -33,10 +33,10 @@ public function handle()
send_user_an_email($mail, $member->email);
}
});
} catch (\Throwable $th) {
send_internal_notification('SubscriptionInvoiceFailedJob failed with: ' . $th->getMessage());
ray($th->getMessage());
throw $th;
} catch (\Throwable $e) {
send_internal_notification('SubscriptionInvoiceFailedJob failed with: ' . $e->getMessage());
ray($e->getMessage());
throw $e;
}
}
}

2
app/Models/PrivateKey.php
View File

@ -24,7 +24,7 @@ public function publicKey()
{
try {
return PublicKeyLoader::load($this->private_key)->getPublicKey()->toString('OpenSSH',['comment' => '']);
} catch (\Exception $e) {
} catch (\Throwable $e) {
return 'Error loading private key';
}
}

2
bootstrap/helpers/docker.php
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([]);
}
}

6
bootstrap/helpers/remoteProcess.php
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;

22
bootstrap/helpers/shared.php
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

2
database/seeders/InstanceSettingsSeeder.php
View File

@ -38,7 +38,7 @@ public function run(): void
if (is_null($settings->public_ipv6) && $ipv6) {
$settings->update(['public_ipv6' => $ipv6]);
}
} catch (\Exception $e) {
} catch (\Throwable $e) {
echo "Error: {$e->getMessage()}\n";
}
}

2
database/seeders/ProductionSeeder.php
View File

@ -119,7 +119,7 @@ public function run(): void
$settings->update(['public_ipv6' => $ipv6]);
}
}
} catch (\Exception $e) {
} catch (\Throwable $e) {
echo "Error: {$e->getMessage()}\n";
}
}