From afb0f68f647b9b4870dda5298fafa140b3d31a2f Mon Sep 17 00:00:00 2001 From: Brady Kirby Date: Fri, 22 Oct 2021 16:07:32 -0500 Subject: [PATCH 1/3] Added monologger logging levels as static array to the Logger class. Added minimum log level support passing to the CloudWatch log handler. --- src/Logger.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/Logger.php b/src/Logger.php index f1dcd9f..f84475b 100644 --- a/src/Logger.php +++ b/src/Logger.php @@ -7,8 +7,18 @@ use Monolog\Formatter\LineFormatter; use Pagevamp\Exceptions\IncompleteCloudWatchConfig; -class Logger -{ +class Logger { + + protected static $log_levels = [ + 'DEBUG' => Logger::DEBUG, + 'INFO' => Logger::INFO, + 'NOTICE' => Logger::NOTICE, + 'WARNING' => Logger::WARNING, + 'ERROR' => Logger::ERROR, + 'CRITICAL' => Logger::CRITICAL, + 'ALERT' => Logger::ALERT, + 'EMERGENCY' => Logger::EMERGENCY + ]; private $app; @@ -19,7 +29,7 @@ public function __construct($app = null) public function __invoke(array $config) { - if($this->app === null) { + if ($this->app === null) { $this->app = \app(); } @@ -31,7 +41,7 @@ public function __invoke(array $config) $groupName = $loggingConfig['group_name']; $batchSize = isset($loggingConfig['batch_size']) ? $loggingConfig['batch_size'] : 10000; - $logHandler = new CloudWatch($cwClient, $groupName, $streamName, $retentionDays, $batchSize); + $logHandler = new CloudWatch($cwClient, $groupName, $streamName, $retentionDays, $batchSize, [], (Logger::$log_levels[strtoupper($loggingConfig['level'])] ?? \Monolog\Logger::DEBUG)); $logger = new \Monolog\Logger($loggingConfig['name']); $formatter = $this->resolveFormatter($loggingConfig); From 7dfad9dd59e6a80c13a92c2c0f590de6d2acc7dc Mon Sep 17 00:00:00 2001 From: Brady Kirby Date: Wed, 27 Oct 2021 16:35:08 -0500 Subject: [PATCH 2/3] Added monolog logger use. Associated the level constants with monolog logger. --- src/Logger.php | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Logger.php b/src/Logger.php index f84475b..e209667 100644 --- a/src/Logger.php +++ b/src/Logger.php @@ -5,19 +5,20 @@ use Aws\CloudWatchLogs\CloudWatchLogsClient; use Maxbanton\Cwh\Handler\CloudWatch; use Monolog\Formatter\LineFormatter; +use Monolog\Logger as MonologLogger; use Pagevamp\Exceptions\IncompleteCloudWatchConfig; class Logger { protected static $log_levels = [ - 'DEBUG' => Logger::DEBUG, - 'INFO' => Logger::INFO, - 'NOTICE' => Logger::NOTICE, - 'WARNING' => Logger::WARNING, - 'ERROR' => Logger::ERROR, - 'CRITICAL' => Logger::CRITICAL, - 'ALERT' => Logger::ALERT, - 'EMERGENCY' => Logger::EMERGENCY + 'DEBUG' => MonologLogger::DEBUG, + 'INFO' => MonologLogger::INFO, + 'NOTICE' => MonologLogger::NOTICE, + 'WARNING' => MonologLogger::WARNING, + 'ERROR' => MonologLogger::ERROR, + 'CRITICAL' => MonologLogger::CRITICAL, + 'ALERT' => MonologLogger::ALERT, + 'EMERGENCY' => MonologLogger::EMERGENCY ]; private $app; @@ -41,8 +42,8 @@ public function __invoke(array $config) $groupName = $loggingConfig['group_name']; $batchSize = isset($loggingConfig['batch_size']) ? $loggingConfig['batch_size'] : 10000; - $logHandler = new CloudWatch($cwClient, $groupName, $streamName, $retentionDays, $batchSize, [], (Logger::$log_levels[strtoupper($loggingConfig['level'])] ?? \Monolog\Logger::DEBUG)); - $logger = new \Monolog\Logger($loggingConfig['name']); + $logHandler = new CloudWatch($cwClient, $groupName, $streamName, $retentionDays, $batchSize, [], (MonologLogger::$log_levels[strtoupper($loggingConfig['level'])] ?? MonologLogger::DEBUG)); + $logger = new MonologLogger($loggingConfig['name']); $formatter = $this->resolveFormatter($loggingConfig); $logHandler->setFormatter($formatter); From 02591d4c103d7aacd5d3c99dd61cde6a28c9486b Mon Sep 17 00:00:00 2001 From: Brady Kirby Date: Wed, 27 Oct 2021 17:07:42 -0500 Subject: [PATCH 3/3] Fixed invalid monologlogger class reference. --- src/Logger.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Logger.php b/src/Logger.php index e209667..ecdc9bd 100644 --- a/src/Logger.php +++ b/src/Logger.php @@ -42,7 +42,7 @@ public function __invoke(array $config) $groupName = $loggingConfig['group_name']; $batchSize = isset($loggingConfig['batch_size']) ? $loggingConfig['batch_size'] : 10000; - $logHandler = new CloudWatch($cwClient, $groupName, $streamName, $retentionDays, $batchSize, [], (MonologLogger::$log_levels[strtoupper($loggingConfig['level'])] ?? MonologLogger::DEBUG)); + $logHandler = new CloudWatch($cwClient, $groupName, $streamName, $retentionDays, $batchSize, [], (Logger::$log_levels[strtoupper($loggingConfig['level'])] ?? MonologLogger::DEBUG)); $logger = new MonologLogger($loggingConfig['name']); $formatter = $this->resolveFormatter($loggingConfig);