From e987508d062370b68fb3d3074c9a42e27393bc2c Mon Sep 17 00:00:00 2001 From: Jeremy Kitchen Date: Tue, 12 Feb 2013 13:28:14 -0800 Subject: [PATCH] \Redis support and LineFormatter as default per #161, this adds support for \Redis as well as switches the defaultFormatter out to use LineFormatter instead. --- src/Monolog/Handler/RedisHandler.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Monolog/Handler/RedisHandler.php b/src/Monolog/Handler/RedisHandler.php index a4b8380c..d916939c 100644 --- a/src/Monolog/Handler/RedisHandler.php +++ b/src/Monolog/Handler/RedisHandler.php @@ -12,8 +12,7 @@ namespace Monolog\Handler; use Monolog\Logger; -use Monolog\Formatter\LogstashFormatter; -use Predis\Client; +use Monolog\Formatter\LineFormatter; /** * Logs to a Redis key using rpush @@ -34,8 +33,8 @@ class RedisHandler extends AbstractProcessingHandler # redis instance, key to use public function __construct($redis, $key, $level = Logger::DEBUG, $bubble = true) { - if (!($redis instanceof Client)) { - throw new \InvalidArgumentException('Predis\Client instance required'); + if (!(($redis instanceof \Predis\Client) || ($redis instanceof \Redis))) { + throw new \InvalidArgumentException('Predis\Client or Redis instance required'); } $this->redisClient = $redis; @@ -46,7 +45,11 @@ class RedisHandler extends AbstractProcessingHandler protected function write(array $record) { - $this->redisClient->rpush($this->redisKey, $record["formatted"]); + if ($this->redisClient instanceof \Predis\Client) { + $this->redisClient->rpush($this->redisKey, $record["formatted"]); + } else { + $this->redisClient->rPush($this->redisKey, $record["formatted"]); + } } /** @@ -54,6 +57,6 @@ class RedisHandler extends AbstractProcessingHandler */ protected function getDefaultFormatter() { - return new LogstashFormatter(); + return new LineFormatter(); } }