Skip to content

Commit 40eff42

Browse files
committed
Merge pull request elastic#1607 from Fewbytes/LOGSTASH-2276
LOGSTASH-2276 fixed if/else branch mixup in rabbitmq input
2 parents 9391457 + 409dc8c commit 40eff42

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/logstash/inputs/rabbitmq/bunny.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ def register
3232
@settings[:verify_ssl] = @verify_ssl if @verify_ssl
3333

3434
proto = if @ssl
35-
"amqp"
36-
else
3735
"amqps"
36+
else
37+
"amqp"
3838
end
3939
@connection_url = "#{proto}://#{@user}@#{@host}:#{@port}#{vhost}/#{@queue}"
4040

lib/logstash/inputs/rabbitmq/march_hare.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ def register
2222
@settings[:tls] = @ssl if @ssl
2323

2424
proto = if @ssl
25-
"amqp"
26-
else
2725
"amqps"
26+
else
27+
"amqp"
2828
end
2929
@connection_url = "#{proto}://#{@user}@#{@host}:#{@port}#{vhost}/#{@queue}"
3030

0 commit comments

Comments
 (0)