diff --git a/app/Console/Commands/Schedule/ProcessRunnableCommand.php b/app/Console/Commands/Schedule/ProcessRunnableCommand.php index f113519c8..a5d007bde 100644 --- a/app/Console/Commands/Schedule/ProcessRunnableCommand.php +++ b/app/Console/Commands/Schedule/ProcessRunnableCommand.php @@ -2,10 +2,8 @@ namespace App\Console\Commands\Schedule; -use Exception; use Illuminate\Console\Command; use App\Models\Schedule; -use Illuminate\Support\Facades\Log; use Illuminate\Database\Eloquent\Builder; use App\Services\Schedules\ProcessScheduleService; @@ -66,7 +64,7 @@ class ProcessRunnableCommand extends Command 'hash' => $schedule->hashid, ])); } catch (\Throwable|\Exception $exception) { - Log::error($exception, ['schedule_id' => $schedule->id]); + logger()->error($exception, ['schedule_id' => $schedule->id]); $this->error("An error was encountered while processing Schedule #$schedule->id: " . $exception->getMessage()); } diff --git a/app/Exceptions/Http/Connection/DaemonConnectionException.php b/app/Exceptions/Http/Connection/DaemonConnectionException.php index 34ff184f9..ffeede718 100644 --- a/app/Exceptions/Http/Connection/DaemonConnectionException.php +++ b/app/Exceptions/Http/Connection/DaemonConnectionException.php @@ -3,7 +3,6 @@ namespace App\Exceptions\Http\Connection; use Illuminate\Http\Response; -use Illuminate\Support\Facades\Log; use GuzzleHttp\Exception\GuzzleException; use App\Exceptions\DisplayException; @@ -70,7 +69,7 @@ class DaemonConnectionException extends DisplayException */ public function report() { - Log::{$this->getErrorLevel()}($this->getPrevious(), [ + logger()->{$this->getErrorLevel()}($this->getPrevious(), [ 'request_id' => $this->requestId, ]); } diff --git a/app/Helpers/Utilities.php b/app/Helpers/Utilities.php index ebf1559fb..e0c824d01 100644 --- a/app/Helpers/Utilities.php +++ b/app/Helpers/Utilities.php @@ -4,7 +4,6 @@ namespace App\Helpers; use Carbon\Carbon; use Cron\CronExpression; -use Illuminate\Support\Facades\Log; use Illuminate\Support\ViewErrorBag; class Utilities @@ -26,7 +25,7 @@ class Utilities } } catch (\Exception $exception) { // Just log the error and hope for the best at this point. - Log::error($exception); + logger()->error($exception); } return $string; diff --git a/app/Http/Controllers/Api/Client/Servers/SubuserController.php b/app/Http/Controllers/Api/Client/Servers/SubuserController.php index 679d2d009..a51d29f2f 100644 --- a/app/Http/Controllers/Api/Client/Servers/SubuserController.php +++ b/app/Http/Controllers/Api/Client/Servers/SubuserController.php @@ -7,7 +7,6 @@ use App\Models\Server; use Illuminate\Http\JsonResponse; use App\Facades\Activity; use App\Models\Permission; -use Illuminate\Support\Facades\Log; use App\Services\Subusers\SubuserCreationService; use App\Repositories\Daemon\DaemonServerRepository; use App\Transformers\Api\Client\SubuserTransformer; @@ -115,7 +114,7 @@ class SubuserController extends ClientApiController } catch (DaemonConnectionException $exception) { // Don't block this request if we can't connect to the daemon instance. Chances are it is // offline and the token will be invalid once daemon boots back. - Log::warning($exception, ['user_id' => $subuser->user_id, 'server_id' => $server->id]); + logger()->warning($exception, ['user_id' => $subuser->user_id, 'server_id' => $server->id]); $instance->property('revoked', false); } @@ -149,7 +148,7 @@ class SubuserController extends ClientApiController $this->serverRepository->setServer($server)->revokeUserJTI($subuser->user_id); } catch (DaemonConnectionException $exception) { // Don't block this request if we can't connect to the daemon instance. - Log::warning($exception, ['user_id' => $subuser->user_id, 'server_id' => $server->id]); + logger()->warning($exception, ['user_id' => $subuser->user_id, 'server_id' => $server->id]); $instance->property('revoked', false); } diff --git a/app/Http/Controllers/Api/Remote/ActivityProcessingController.php b/app/Http/Controllers/Api/Remote/ActivityProcessingController.php index c7d739607..e07584d23 100644 --- a/app/Http/Controllers/Api/Remote/ActivityProcessingController.php +++ b/app/Http/Controllers/Api/Remote/ActivityProcessingController.php @@ -7,7 +7,6 @@ use Illuminate\Support\Str; use App\Models\User; use Webmozart\Assert\Assert; use App\Models\Server; -use Illuminate\Support\Facades\Log; use App\Models\ActivityLog; use App\Models\ActivityLogSubject; use App\Http\Controllers\Controller; @@ -40,7 +39,7 @@ class ActivityProcessingController extends Controller 'UTC' ); } catch (\Exception $exception) { - Log::warning($exception, ['timestamp' => $datum['timestamp']]); + logger()->warning($exception, ['timestamp' => $datum['timestamp']]); // If we cannot parse the value for some reason don't blow up this request, just go ahead // and log the event with the current time, and set the metadata value to have the original diff --git a/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php b/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php index 175acffa1..dfa707357 100644 --- a/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php +++ b/app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php @@ -7,7 +7,6 @@ use App\Repositories\Daemon\DaemonServerRepository; use Illuminate\Http\Response; use Illuminate\Http\JsonResponse; use App\Models\Allocation; -use Illuminate\Support\Facades\Log; use App\Models\ServerTransfer; use Illuminate\Database\ConnectionInterface; use App\Http\Controllers\Controller; @@ -80,7 +79,7 @@ class ServerTransferController extends Controller ->setNode($transfer->oldNode) ->delete(); } catch (DaemonConnectionException $exception) { - Log::warning($exception, ['transfer_id' => $server->transfer->id]); + logger()->warning($exception, ['transfer_id' => $server->transfer->id]); } return new JsonResponse([], Response::HTTP_NO_CONTENT); diff --git a/app/Services/Activity/ActivityLogService.php b/app/Services/Activity/ActivityLogService.php index fa01aef44..37b7ae43b 100644 --- a/app/Services/Activity/ActivityLogService.php +++ b/app/Services/Activity/ActivityLogService.php @@ -5,7 +5,6 @@ namespace App\Services\Activity; use Illuminate\Support\Arr; use Webmozart\Assert\Assert; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\Log; use App\Models\ActivityLog; use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Request; @@ -147,7 +146,7 @@ class ActivityLogService throw $exception; } - Log::error($exception); + logger()->error($exception); } return $activity; diff --git a/app/Services/Nodes/NodeUpdateService.php b/app/Services/Nodes/NodeUpdateService.php index 138ad2498..b943552b3 100644 --- a/app/Services/Nodes/NodeUpdateService.php +++ b/app/Services/Nodes/NodeUpdateService.php @@ -4,7 +4,6 @@ namespace App\Services\Nodes; use Illuminate\Support\Str; use App\Models\Node; -use Illuminate\Support\Facades\Log; use Illuminate\Database\ConnectionInterface; use Illuminate\Contracts\Encryption\Encrypter; use App\Repositories\Daemon\DaemonConfigurationRepository; @@ -51,7 +50,7 @@ class NodeUpdateService $this->configurationRepository->setNode($node)->update($updated); } catch (DaemonConnectionException $exception) { - Log::warning($exception, ['node_id' => $node->id]); + logger()->warning($exception, ['node_id' => $node->id]); // Never actually throw these exceptions up the stack. If we were able to change the settings // but something went wrong with daemon we just want to store the update and let the user manually diff --git a/app/Services/Servers/BuildModificationService.php b/app/Services/Servers/BuildModificationService.php index 502ca7e9b..24b5a52a1 100644 --- a/app/Services/Servers/BuildModificationService.php +++ b/app/Services/Servers/BuildModificationService.php @@ -5,7 +5,6 @@ namespace App\Services\Servers; use Illuminate\Support\Arr; use App\Models\Server; use App\Models\Allocation; -use Illuminate\Support\Facades\Log; use Illuminate\Database\ConnectionInterface; use App\Exceptions\DisplayException; use Illuminate\Database\Eloquent\ModelNotFoundException; @@ -67,7 +66,7 @@ class BuildModificationService try { $this->daemonServerRepository->setServer($server)->sync(); } catch (DaemonConnectionException $exception) { - Log::warning($exception, ['server_id' => $server->id]); + logger()->warning($exception, ['server_id' => $server->id]); } } diff --git a/app/Services/Servers/ServerDeletionService.php b/app/Services/Servers/ServerDeletionService.php index 024909b14..b19e30808 100644 --- a/app/Services/Servers/ServerDeletionService.php +++ b/app/Services/Servers/ServerDeletionService.php @@ -4,7 +4,6 @@ namespace App\Services\Servers; use Illuminate\Http\Response; use App\Models\Server; -use Illuminate\Support\Facades\Log; use Illuminate\Database\ConnectionInterface; use App\Repositories\Daemon\DaemonServerRepository; use App\Services\Databases\DatabaseManagementService; @@ -53,7 +52,7 @@ class ServerDeletionService throw $exception; } - Log::warning($exception); + logger()->warning($exception); } $this->connection->transaction(function () use ($server) { @@ -71,7 +70,7 @@ class ServerDeletionService // handle this better anyways. $database->delete(); - Log::warning($exception); + logger()->warning($exception); } }