rack-logstash 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6194bf38754cc2bd1e2a4f710f849062700bbef
-  data.tar.gz: caa4203aefbdd9693a534c699d5cad7663455df8
+  metadata.gz: 6c1754225ede7a3f169dbd9df3f2c4c3e91ee014
+  data.tar.gz: 54b08203e18a32428929e01dc0093fb63cbdd00d
 SHA512:
-  metadata.gz: 8cf5e13fa9c69cce9f5047d7b7cc7b0a753cfb4a1af861c1061bbb046d3683b13a2f4ee5dd862b1ebb365cc0f05caa2e69d2863e90a2d674172c3abd28cca6b3
-  data.tar.gz: e7381665d393fd83333cc7b612ee76b9cc912daa4db3eb9b01f5826ad3945cc3b1af503a5a1bae914234d6bd18c176bcd1b6069428baa01205e6c678bb9585a2
+  metadata.gz: 569bdaf5fc7e02735ee6549388af45cadb0e1403f05f7af12223926065148bef741bde60de85ca3f59b30b98ffccc22a5f2e38c457a9e5c5b3dfaa784bf4b1fc
+  data.tar.gz: e83ea0a8bcb28dfca1ff4ceeaed27d2a24d797cef847ca55303a3b2dcc1da52d22d42ca9e2ab0b751475c3ad221db9f18f3c80a2958fffdd4cf7624b2baa6e32

data/lib/rack/logstash.rb

@@ -17,7 +17,12 @@ module Rack
 
 			begin
 				@app.call(env).tap do |response|
-					log_request(env, response)
+					begin
+						log_request(env, response)
+					rescue StandardError => ex
+						$stderr.puts "Failed to log request: #{ex.message} (#{ex.class})"
+						$stderr.puts ex.backtrace.map { |l| "  #{l}" }
+					end
 				end
 			rescue StandardError => ex
 				log_exception(env, ex)
@@ -131,9 +136,9 @@ module Rack
 			Hash[
 				env.map do |k, v|
 					unless v.is_a? Hash or
-						    v.is_a? Array or
-						    v.is_a? String or
-						    v.is_a? Numeric
+					       v.is_a? Array or
+					       v.is_a? String or
+					       v.is_a? Numeric
 						next nil
 					end
 

data/lib/rack/logstash/transport.rb

@@ -13,8 +13,13 @@ module Rack
 			end
 
 			def send(s)
-				@blmutex.synchronize { @backlog << s }
-				@sender.run
+				begin
+					@blmutex.synchronize { @backlog << s }
+					@sender.run
+				rescue StandardError => ex
+					$stderr.puts "Failed to send message: #{ex.message} (#{ex.class})"
+					$stderr.puts ex.backtrace.map { |l| "  #{l}" }
+				end
 			end
 
 			def drain
@@ -40,9 +45,14 @@ module Rack
 								end
 							end
 							Thread.stop
-						rescue Exception => ex
-							@stderr.puts "sender_thread died!  #{ex.message} (#{ex.class})"
+						rescue StandardError => ex
+							$stderr.puts "sender_thread crashed!  #{ex.message} (#{ex.class})"
 							$stderr.puts ex.backtrace.map { |l| "  #{l}" }
+							sleep 0.1
+						rescue Exception => ex
+							$stderr.puts "sender_thread is being killed by #{ex.class}"
+							@sender = nil
+							raise
 						end
 					end
 				end
@@ -70,9 +80,9 @@ module Rack
 				@parsed_url ||= URI(@url).tap do |url|
 					if url.scheme != "tcp"
 						raise ArgumentError,
-								"Unknown scheme for Logstash server URL: " +
-								url.scheme.inspect +
-								" (we only accept 'tcp')"
+						      "Unknown scheme for Logstash server URL: " +
+						      url.scheme.inspect +
+						      " (we only accept 'tcp')"
 					end
 				end
 			end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-logstash
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler