Merge pull request #510 from DirectoryTree/change-logging-channel

Add ability to set a logging channel
DirectoryTree · Feb 9, 2023 · 5f36d4b · 5f36d4b
2 parents 0ed5d8d + ca70cab
commit 5f36d4b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/config/ldap.php b/config/ldap.php
@@ -54,6 +54,8 @@
 
     'logging' => env('LDAP_LOGGING', true),
 
+    'logging_channel' => env('LOG_CHANNEL', 'stack'),
+
     /*
     |--------------------------------------------------------------------------
     | LDAP Cache

diff --git a/src/LdapServiceProvider.php b/src/LdapServiceProvider.php
@@ -82,9 +82,16 @@ protected function registerLogging()
             return;
         }
 
-        if (! is_null($logger = Log::getFacadeRoot())) {
-            Container::getInstance()->setLogger($logger);
+        /** @var \Illuminate\Log\LogManager|null $logger */
+        if (is_null($logger = Log::getFacadeRoot())) {
+            return;
         }
+
+        Container::getInstance()->setLogger(
+            ($channel = Config::get('ldap.logging_channel'))
+                ? $logger->channel($channel)
+                : $logger
+        );
     }
 
     /**

diff --git a/tests/Unit/LdapServiceProviderTest.php b/tests/Unit/LdapServiceProviderTest.php
@@ -2,12 +2,12 @@
 
 namespace LdapRecord\Laravel\Tests\Unit;
 
-use Illuminate\Log\LogManager;
 use LdapRecord\Connection;
 use LdapRecord\Container;
 use LdapRecord\Laravel\LdapServiceProvider;
 use LdapRecord\Laravel\Tests\TestCase;
 use LdapRecord\Query\Cache;
+use Psr\Log\LoggerInterface;
 
 class LdapServiceProviderTest extends TestCase
 {
@@ -64,7 +64,7 @@ public function test_config_is_publishable()
 
     public function test_logger_is_set_on_container_when_enabled()
     {
-        $this->assertInstanceOf(LogManager::class, Container::getInstance()->getLogger());
+        $this->assertInstanceOf(LoggerInterface::class, Container::getInstance()->getLogger());
     }
 
     public function test_cache_is_set_on_connection_when_enabled()
@@ -143,6 +143,7 @@ public function test_env_config_is_loaded_and_cacheable()
                 ],
             ],
             'logging' => true,
+            'logging_channel' => 'stack',
             'cache' => [
                 'enabled' => true,
                 'driver' => 'array',