[UPDATE] Redis Handler config data update and updated README

orasik · Jun 3, 2016 · f593812 · f593812
1 parent 7cd8b5f
commit f593812
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -95,7 +95,7 @@ $logglyHandler = [
 'loggly'   =>
     [
         'type'   => 'loggly',
-        'token'  => 'your-loggly-token',
+        'token'   => 'your-loggly-token',
         'level'  => Logger::DEBUG,
         'bubble' => true, //optional
     ],
@@ -158,6 +158,21 @@ $browserConsoleHandler = [
     ],
 ];
 ```
+
+##### Redis handler
+```php
+$redisHandler = [
+'redis'   =>
+    [
+        'type'          => 'redis',
+        'level'         => Logger::DEBUG,
+        'redis_client'  => new \Redis(),
+        'key'           => 'monolog',
+    ],
+];
+```
+
+
 #### Extending Middleware
 
 To extend the middleware to log your own format, or specific data like cookies, server params .. etc. You can do that easily using the following steps:

diff --git a/src/MonologMiddleware/Extension/MonologConfigurationExtension.php b/src/MonologMiddleware/Extension/MonologConfigurationExtension.php
@@ -350,7 +350,7 @@ public function getHandler($name, $handlerConfig)
                 $bubble = (isset($handlerConfig['bubble']) ? $handlerConfig['bubble'] : true);
                 $capSize = (isset($handlerConfig['cap_size']) ? $handlerConfig['cap_size'] : false);
 
-                return new RedisHandler($handlerConfig['redis'], $handlerConfig['key'], $bubble, $capSize);
+                return new RedisHandler($handlerConfig['redis_client'], $handlerConfig['key'], $bubble, $capSize);
                 break;
             case 'rotating_file':
             case 'swift_mailer':

diff --git a/src/MonologMiddleware/Test/Validator/ValidateRedisHandlerConfigTest.php b/src/MonologMiddleware/Test/Validator/ValidateRedisHandlerConfigTest.php
@@ -11,10 +11,10 @@ class ValidateRedisHandlerConfigTest extends \PHPUnit_Framework_TestCase
     public function testValidate()
     {
         $configArray = [
-            'type'  => 'redis',
-            'level' => 'INFO',
-            'redis' => new \Redis(),
-            'key'   => 'monolog'
+            'type'         => 'redis',
+            'level'        => 'INFO',
+            'redis_client' => new \Redis(),
+            'key'          => 'monolog'
         ];
 
         $redisValidator = new ValidateRedisHandlerConfig($configArray);
@@ -24,9 +24,9 @@ public function testValidate()
     public function testHasRedisClient()
     {
         $configArray = [
-            'type'  => 'redis',
-            'level' => 'INFO',
-            'redis' => new \Redis(),
+            'type'         => 'redis',
+            'level'        => 'INFO',
+            'redis_client' => new \Redis(),
         ];
 
         $redisValidator = new ValidateRedisHandlerConfig($configArray);
@@ -49,9 +49,9 @@ public function testNotHasRedisClient()
     public function testHasRedisValueButNotRedisClient()
     {
         $configArray = [
-            'type'  => 'redis',
-            'level' => 'INFO',
-            'redis' => 'REDIS',
+            'type'         => 'redis',
+            'level'        => 'INFO',
+            'redis_client' => 'REDIS',
         ];
         self::setExpectedException('MonologMiddleware\Exception\MonologConfigException');
         $redisValidator = new ValidateRedisHandlerConfig($configArray);
@@ -76,7 +76,7 @@ public function testHasNoKey()
             'type'  => 'redis',
             'level' => 'INFO',
         ];
-        
+
         self::setExpectedException('MonologMiddleware\Exception\MonologConfigException');
         $redisValidator = new ValidateRedisHandlerConfig($configArray);
         $this->assertTrue($redisValidator->hasKey());

diff --git a/src/MonologMiddleware/Validator/ValidateRedisHandlerConfig.php b/src/MonologMiddleware/Validator/ValidateRedisHandlerConfig.php
@@ -28,7 +28,7 @@ public function validate()
      */
     public function hasRedisClient()
     {
-        if (isset($this->handlerConfigArray['redis']) && $this->handlerConfigArray['redis'] instanceof \Redis) {
+        if (isset($this->handlerConfigArray['redis_client']) && $this->handlerConfigArray['redis_client'] instanceof \Redis) {
             return true;
         } else {
             throw new MonologConfigException("Missing Redis client in Redis handler configuration");