Merge pull request #1607 from Fewbytes/LOGSTASH-2276

LOGSTASH-2276 fixed if/else branch mixup in rabbitmq input
2025-04-23 22:27:21 -04:00 · 2014-08-22 16:15:35 -07:00 · 2014-08-22 16:15:35 -07:00 · 40eff426eb
commit 40eff426eb
parent 939145723b 409dc8c366
2 changed files with 4 additions and 4 deletions
--- 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}"

--- 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}"