logstash-core 6.3.1-java → 6.3.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85bf9d81a766d2472fbac4f9ebe4b7a88cae89e18590d7ce521ce40fe9774c15
-  data.tar.gz: 4deb3840e2c037c2e34467b64760c4cbea3d48ad43eb67f7cd6b321dedbab4b6
+  metadata.gz: 999e61360e29d34d6dbf15eebfa5a852f0114cc034c876e65f0ee434aadbefd7
+  data.tar.gz: 0366ea08d19ed8f15316c6b48ab8262ac8f5f810be24308017b445624578ed5c
 SHA512:
-  metadata.gz: 7c898a6f5e3563f40cc9e5c362e63eefe454bb730938c5049b6b57b38e0e94fa5f96bdc919f9cdd18fb31b41b403033d38dfa686b7d41dc6e2757df5744b8249
-  data.tar.gz: 39995c13a874c7dc4e044ae4ed7aa3fc9c66bbc4c2f35de50fedf10b0f96fcf3593e5db5523da8595e42544dad2e40d6d6daa223160a73b7dc22b87ff3dd1dbc
+  metadata.gz: 83bb9dc76db210ebf2a1d6f1094b2f0aaf2aa4e1fdeca7b97c9682b585138b67f45b1138357b096da241cf9145b787db83d615e62fdca072c80675c1769d4e92
+  data.tar.gz: c1d165d04b42ba541b42110f4e640cfa3f818a74c585a564df0c45bef69a43a2d6b137f04fb1fd57313994220ac80ec9d7ca862611d77dae6248da476b2ed2c4

data/lib/logstash/agent.rb

@@ -340,7 +340,7 @@ class LogStash::Agent
       when LogStash::PipelineAction::Reload
         dispatcher.fire(:pipeline_stopped, get_pipeline(action.pipeline_id))
       when LogStash::PipelineAction::Stop
-        dispatcher.fire(:pipeline_started, get_pipeline(action.pipeline_id))
+        dispatcher.fire(:pipeline_stopped, get_pipeline(action.pipeline_id))
       end
     end
   end

data/lib/logstash/patches.rb

@@ -4,3 +4,4 @@ require "logstash/patches/cabin"
 require "logstash/patches/profile_require_calls"
 require "logstash/patches/stronger_openssl_defaults"
 require "logstash/patches/exception_to_json"
+require "logstash/patches/resolv"

data/lib/logstash/patches/resolv.rb

@@ -0,0 +1,40 @@
+require "resolv"
+
+# ref: https://github.com/logstash-plugins/logstash-filter-dns/issues/40
+#
+# JRuby 9k versions prior to 9.1.16.0 have a bug which crashes IP address
+# resolution after 64k unique IP addresses resolutions.
+#
+# Note that the oldest JRuby version in LS 6 is 9.1.13.0 and
+# JRuby 1.7.25 and 1.7.27 (the 2 versions used across LS 5) are not affected by this bug.
+
+# make sure we abort if a known correct JRuby version is installed 
+# to avoid having an unnecessary legacy patch being applied in the future.
+raise("Unnecessary patch on resolv.rb for JRuby version 9.1.16+") if Gem::Version.new(JRUBY_VERSION) >= Gem::Version.new("9.1.16.0")
+
+# The code below is copied from JRuby 9.1.16.0 resolv.rb:
+# https://github.com/jruby/jruby/blob/9.1.16.0/lib/ruby/stdlib/resolv.rb#L775-L784
+#
+# JRuby is Copyright (c) 2007-2017 The JRuby project, and is released
+# under a tri EPL/GPL/LGPL license.
+# Full license available at https://github.com/jruby/jruby/blob/9.1.16.0/COPYING
+
+class Resolv
+  class DNS
+    class Requester
+      class UnconnectedUDP
+        def sender(msg, data, host, port=Port)
+          sock = @socks_hash[host.index(':') ? "::" : "0.0.0.0"]
+          return nil if !sock
+          service = [IPAddr.new(host), port]
+          id = DNS.allocate_request_id(service[0], service[1])
+          request = msg.encode
+          request[0,2] = [id].pack('n')
+          return @senders[[service, id]] =
+              Sender.new(request, data, sock, host, port)
+        end
+      end
+    end
+  end
+end
+

data/versions-gem-copy.yml

@@ -1,6 +1,6 @@
 ---
-logstash: 6.3.1
-logstash-core: 6.3.1
+logstash: 6.3.2
+logstash-core: 6.3.2
 logstash-core-plugin-api: 2.1.16
 
 # jruby must reference a *released* version of jruby which can be downloaded from the official download url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-core
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 6.3.2
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -420,6 +420,7 @@ files:
 - lib/logstash/patches/exception_to_json.rb
 - lib/logstash/patches/profile_require_calls.rb
 - lib/logstash/patches/puma.rb
+- lib/logstash/patches/resolv.rb
 - lib/logstash/patches/stronger_openssl_defaults.rb
 - lib/logstash/pipeline.rb
 - lib/logstash/pipeline_action.rb