Fix broken sniffing code

Author: andrewvc

lib/logstash/outputs/elasticsearch/http_client/manticore_adapter.rb

@@ -27,20 +27,8 @@ def perform_request(url, method, path, params={}, body=nil)
       params[:body] = body if body
       url_and_path = (url + path).to_s # Convert URI object to string
 
-      case method
-      when :get
-        resp = @manticore.get(url_and_path, params)
-      when :head
-        resp = @manticore.head(url_and_path, params)
-      when :put
-        resp = @manticore.put(url_and_path, params)
-      when :post
-        resp = @manticore.post(url_and_path, params)
-      when :delete
-        resp = @manticore.delete(url_and_path, params)
-      else
-        raise ArgumentError.new "Method #{method} not supported"
-      end
+
+      resp = @manticore.send(method.downcase, url_and_path, params)
 
       # Manticore returns lazy responses by default
       # We want to block for our usage, this will wait for the repsonse

lib/logstash/outputs/elasticsearch/http_client/pool.rb

@@ -130,7 +130,7 @@ def sniff!
     ES2_SNIFF_RE_URL  = /([^\/]*)?\/?([^:]*):([0-9]+)/
     # Sniffs and returns the results. Does not update internal URLs!
     def check_sniff
-      resp = perform_request('GET', '_nodes')
+      url, resp = perform_request('GET', '_nodes')
       parsed = LogStash::Json.load(resp.body)
       parsed['nodes'].map do |id,info|
         # TODO Make sure this works with shield. Does that listed
@@ -146,11 +146,11 @@ def check_sniff
         attributes = info['attributes']
         next if attributes && attributes['data'] == 'false'
 
-        matches = addr_str.match(ES1_RE_URL) || addr_str.match(ES2_RE_URL)
+        matches = addr_str.match(ES1_SNIFF_RE_URL) || addr_str.match(ES2_SNIFF_RE_URL)
         if matches
           host = matches[1].empty? ? matches[2] : matches[1]
           port = matches[3]
-          info.merge :host => host, :port => port, :id => id
+          URI.parse("#{@scheme}://#{host}:#{port}")
         end
       end.compact
     end