logstash_writer 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 581706d47cefad1062b70b5abf2e6689dac1671a3edbaeaad776bb4b8af8aa21
-  data.tar.gz: f9c9e6939dfc94a8aad4c54ee175fc8d0f3a2b9d35a1a932ab5944df3c0267cc
+  metadata.gz: 9254bae4e4a6f114fd683a3509b576d272256e162ecc5722c8d1c7a78a3e25e3
+  data.tar.gz: 9e61badc96a9bc3028a15311117eb95b6d3f37c7c59d950d66fe76d223160363
 SHA512:
-  metadata.gz: b019d96a15b990080f0afc0fc0f9d5dad69644d92338e07dde8eabc9dece477e88f207a8b6f78e49be6a910351826c8640b51b52475589ad5d888320ee8d0f02
-  data.tar.gz: f7c747495bd1823e3f62d52f88b33b60e7df0039242c874333d94462d9b3a7d9f88cc14a0a28b9857cf8a3729b02dbe93f1990c642a51b2910380ccbbad43d8f
+  metadata.gz: 97ebc1f452ecc063b81e534ffb87e62ac4f225101454494ad8058abc18cef6427986b93a8643bc87631fdbde9d629dbebb35a51936f403a20e2d84b5517086b5
+  data.tar.gz: 01f8be94cee73a68b228e69f55f4f2d8e6448f8d37d885427a741cb8786f4c8fc37e1a99567ee92c8133f27e3faded0f6b3b1ca19cfe0bc382696682b281b6c7

data/lib/logstash_writer.rb

@@ -121,7 +121,7 @@ class LogstashWriter
     end
 
     if e.has_key?("@metadata")
-      e[:@metadata] = (e[:@metadata] || {}).merge(e["@metadata"])
+      e[:@metadata] = (e[:@metadata] || {}).merge(e.delete("@metadata"))
     end
 
     unless e.has_key?(:@metadata)
@@ -285,16 +285,20 @@ class LogstashWriter
       @socket_mutex.synchronize do
         if @current_target
           begin
-            # Check that our socket is still good to go; if we don't do this,
-            # the other end can disconnect, and because we're never normally
-            # reading from the socket, we never get the EOFError that normally
-            # results, and so the socket remains in CLOSE_WAIT state *forever*.
-            @current_target.socket.read_nonblock(1)
+            # Check that our socket is still good to go; if we don't do
+            # this, the other end can disconnect, and because we're never
+            # normally reading from the socket, we never get the EOFError
+            # that normally results, and so the socket remains in CLOSE_WAIT
+            # state *forever*.  raising an ENOTCONN gets us into the
+            # SystemCallError rescue, which is where we want to be, and
+            # "Transport endpoint is not connected" seems like a suitably
+            # appropriate error to me under the circumstances.
+            raise Errno::ENOTCONN unless IO.select([@current_target.socket], [], [], 0).nil?
 
             yield @current_target
             @metrics[:connected].set({ server: @current_target.describe_peer }, 1)
             done = true
-          rescue SystemCallError, IOError => ex
+          rescue SystemCallError => ex
             # Something went wrong during the send; disconnect from this
             # server and recycle
             @metrics[:write_exception].increment(server: @current_target.describe_peer, class: ex.class.to_s)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstash_writer
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Matt Palmer