From 409dc8c36622c649bfd8a1905cbfc0ead174f7c7 Mon Sep 17 00:00:00 2001 From: Avishai Ish-Shalom Date: Thu, 7 Aug 2014 08:38:51 +0300 Subject: [PATCH] LOGSTASH-2276 fixed if/else branch mixup in rabbitmq input --- lib/logstash/inputs/rabbitmq/bunny.rb | 4 ++-- lib/logstash/inputs/rabbitmq/march_hare.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/logstash/inputs/rabbitmq/bunny.rb b/lib/logstash/inputs/rabbitmq/bunny.rb index 459414343..c933f7a4a 100644 --- a/lib/logstash/inputs/rabbitmq/bunny.rb +++ b/lib/logstash/inputs/rabbitmq/bunny.rb @@ -32,9 +32,9 @@ class LogStash::Inputs::RabbitMQ @settings[:verify_ssl] = @verify_ssl if @verify_ssl proto = if @ssl - "amqp" - else "amqps" + else + "amqp" end @connection_url = "#{proto}://#{@user}@#{@host}:#{@port}#{vhost}/#{@queue}" diff --git a/lib/logstash/inputs/rabbitmq/march_hare.rb b/lib/logstash/inputs/rabbitmq/march_hare.rb index 6a80d4de2..d2f0f0bc5 100644 --- a/lib/logstash/inputs/rabbitmq/march_hare.rb +++ b/lib/logstash/inputs/rabbitmq/march_hare.rb @@ -22,9 +22,9 @@ class LogStash::Inputs::RabbitMQ @settings[:tls] = @ssl if @ssl proto = if @ssl - "amqp" - else "amqps" + else + "amqp" end @connection_url = "#{proto}://#{@user}@#{@host}:#{@port}#{vhost}/#{@queue}"