From 8459a784d006d9840a91111bf64301fa61ec531c Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Tue, 1 Oct 2024 16:41:14 +0800 Subject: [PATCH] Laravel Vapor - Making sure code meant for laravel vapor can run locally without any problem with default settings --- .env.example | 1 + app/Classes/General/LogHelper.php | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index e7d65223..c007402d 100644 --- a/.env.example +++ b/.env.example @@ -60,6 +60,7 @@ PERFEXCRM_BASE_URL="" PERFEXCRM_API_KEY="" PERFEXCRM_IS_ENABLED="false" +VAPOR_ENV=local LARAVEL_VAPOR_ENABLED=false COMMANDS_V2_ENABLED=false diff --git a/app/Classes/General/LogHelper.php b/app/Classes/General/LogHelper.php index 23d133c8..ffea115c 100644 --- a/app/Classes/General/LogHelper.php +++ b/app/Classes/General/LogHelper.php @@ -18,8 +18,9 @@ class LogHelper public function info($message) { $envVar = env('LARAVEL_VAPOR_ENABLED'); + $isLocal = env('VAPOR_ENV') === 'local'; Log::info("LogHelper.info: {$message}, channelName: {$this->channelName}, envVar {$envVar}"); - if ($envVar) { + if ($envVar && !$isLocal) { Log::channel($this->channelName.'_vapor')->info($message); } else{ @@ -30,8 +31,9 @@ class LogHelper public function warning($message) { $envVar = env('LARAVEL_VAPOR_ENABLED'); + $isLocal = env('VAPOR_ENV') === 'local'; Log::info("LogHelper.warning: {$message}, channelName: {$this->channelName}, envVar {$envVar}"); - if ($envVar) { + if ($envVar && !$isLocal) { Log::channel($this->channelName . '_vapor')->warning($message); } else { Log::channel($this->channelName)->warning($message); @@ -41,8 +43,9 @@ class LogHelper public function error($message) { $envVar = env('LARAVEL_VAPOR_ENABLED'); + $isLocal = env('VAPOR_ENV') === 'local'; Log::info("LogHelper.error: {$message}, channelName: {$this->channelName}, envVar {$envVar}"); - if ($envVar) { + if ($envVar && !$isLocal) { Log::channel($this->channelName . '_vapor')->error($message); } else { Log::channel($this->channelName)->error($message);