From b9bf56a3307e89faf0f5ca71ff034ea41c80f8dd Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Thu, 26 May 2016 20:06:10 +0100 Subject: [PATCH] Remove exchangeName usage for AMQP extension users and make PhpAmqpLib use it only if provided, no more default to "log", fixes #355 --- src/Monolog/Handler/AmqpHandler.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Monolog/Handler/AmqpHandler.php b/src/Monolog/Handler/AmqpHandler.php index 4711922f..b83a3a9e 100644 --- a/src/Monolog/Handler/AmqpHandler.php +++ b/src/Monolog/Handler/AmqpHandler.php @@ -32,15 +32,13 @@ class AmqpHandler extends AbstractProcessingHandler /** * @param AMQPExchange|AMQPChannel $exchange AMQPExchange (php AMQP ext) or PHP AMQP lib channel, ready for use - * @param string $exchangeName + * @param string $exchangeName Optional exchange name, for AMQPChannel (PhpAmqpLib) only * @param int $level * @param bool $bubble Whether the messages that are handled can bubble up the stack or not */ - public function __construct($exchange, $exchangeName = 'log', $level = Logger::DEBUG, $bubble = true) + public function __construct($exchange, $exchangeName = null, $level = Logger::DEBUG, $bubble = true) { - if ($exchange instanceof AMQPExchange) { - $exchange->setName($exchangeName); - } elseif ($exchange instanceof AMQPChannel) { + if ($exchange instanceof AMQPChannel) { $this->exchangeName = $exchangeName; } else { throw new \InvalidArgumentException('PhpAmqpLib\Channel\AMQPChannel or AMQPExchange instance required');