From f1587d3302209ad6dc7eb688c3dfe9decb9acf5a Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Wed, 6 Nov 2024 12:39:37 +0100 Subject: [PATCH] cleanups --- app/Livewire/Server/Destinations.php | 1 - app/Models/Server.php | 4 ++-- app/Models/ServerSetting.php | 3 ++- database/migrations/2024_06_25_184323_update_db.php | 3 ++- database/seeders/SentinelSeeder.php | 3 ++- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Livewire/Server/Destinations.php b/app/Livewire/Server/Destinations.php index c10958bd1..dbab6e03f 100644 --- a/app/Livewire/Server/Destinations.php +++ b/app/Livewire/Server/Destinations.php @@ -19,7 +19,6 @@ class Destinations extends Component try { $this->networks = collect(); $this->server = Server::ownedByCurrentTeam()->whereUuid($server_uuid)->firstOrFail(); - loggy($this->server); } catch (\Throwable $e) { return handleError($e, $this); } diff --git a/app/Models/Server.php b/app/Models/Server.php index 55a4742c0..0fcfd89ab 100644 --- a/app/Models/Server.php +++ b/app/Models/Server.php @@ -1229,7 +1229,7 @@ $schema://$host { return str($this->ip)->contains(':'); } - public function restartSentinel(bool $async = true): void + public function restartSentinel(bool $async = true) { try { if ($async) { @@ -1238,7 +1238,7 @@ $schema://$host { StartSentinel::run($this, true); } } catch (\Throwable $e) { - loggy('Error restarting Sentinel: '.$e->getMessage()); + return handleError($e, $this); } } diff --git a/app/Models/ServerSetting.php b/app/Models/ServerSetting.php index bca16536e..e72c8c444 100644 --- a/app/Models/ServerSetting.php +++ b/app/Models/ServerSetting.php @@ -4,6 +4,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Model; +use Illuminate\Support\Facades\Log; use OpenApi\Attributes as OA; #[OA\Schema( @@ -69,7 +70,7 @@ class ServerSetting extends Model $setting->generateSentinelUrl(save: false); } } catch (\Throwable $e) { - loggy('Error creating server setting: '.$e->getMessage()); + Log::error('Error creating server setting: '.$e->getMessage()); } }); static::updated(function ($settings) { diff --git a/database/migrations/2024_06_25_184323_update_db.php b/database/migrations/2024_06_25_184323_update_db.php index 8f9405b86..d9cddb15f 100644 --- a/database/migrations/2024_06_25_184323_update_db.php +++ b/database/migrations/2024_06_25_184323_update_db.php @@ -5,6 +5,7 @@ use App\Models\Server; use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Schema; use Visus\Cuid2\Cuid2; @@ -52,7 +53,7 @@ return new class extends Migration DB::table('server_settings')->update(['metrics_history_days' => 7]); } catch (\Exception $e) { - loggy($e); + Log::error('Error updating db: '.$e->getMessage()); } } diff --git a/database/seeders/SentinelSeeder.php b/database/seeders/SentinelSeeder.php index 117ba6782..d61c2f55d 100644 --- a/database/seeders/SentinelSeeder.php +++ b/database/seeders/SentinelSeeder.php @@ -4,6 +4,7 @@ namespace Database\Seeders; use App\Models\Server; use Illuminate\Database\Seeder; +use Illuminate\Support\Facades\Log; class SentinelSeeder extends Seeder { @@ -23,7 +24,7 @@ class SentinelSeeder extends Seeder } } } catch (\Throwable $e) { - loggy("Error: {$e->getMessage()}\n"); + Log::error('Error seeding sentinel: '.$e->getMessage()); } } });