rack-logstash 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c1754225ede7a3f169dbd9df3f2c4c3e91ee014
-  data.tar.gz: 54b08203e18a32428929e01dc0093fb63cbdd00d
+  metadata.gz: 579f583ac3d77ba36605fde8016cf8b35148fb31
+  data.tar.gz: 3e7a7de816ad49987918b1cb0fd8b02b5e4eb7b3
 SHA512:
-  metadata.gz: 569bdaf5fc7e02735ee6549388af45cadb0e1403f05f7af12223926065148bef741bde60de85ca3f59b30b98ffccc22a5f2e38c457a9e5c5b3dfaa784bf4b1fc
-  data.tar.gz: e83ea0a8bcb28dfca1ff4ceeaed27d2a24d797cef847ca55303a3b2dcc1da52d22d42ca9e2ab0b751475c3ad221db9f18f3c80a2958fffdd4cf7624b2baa6e32
+  metadata.gz: 7358100741f327cc2af288006710045f5ab47ddd57ab25dffe74de335ae9b495f66afa4b8ef4faed41d635c898027bc49203ab043f8c312929d03fb11cc21a28
+  data.tar.gz: 17d7186d1ceec4b0da71149ce5422a59e04e7cc1c732cd79aa82d660be279ec19508972b68ab6c208d26d9e743cf1fe0029ed5d8e07c28520c63157a06d389dc

data/lib/rack/logstash.rb

@@ -1,4 +1,3 @@
-require 'json'
 require 'rack/logstash/extended_request'
 require 'rack/logstash/transport'
 require 'ipaddr'
@@ -33,7 +32,7 @@ module Rack
 		private
 
 		def log_request(env, response)
-			@server.send(request_log_entry(env, response).to_json)
+			@server.send(request_log_entry(env, response))
 		end
 
 		def request_log_entry(env, response)
@@ -64,7 +63,7 @@ module Rack
 		end
 
 		def log_exception(env, ex)
-			@server.send(exception_log_entry(env, ex).to_json)
+			@server.send(exception_log_entry(env, ex))
 		end
 
 		def exception_log_entry(env, ex)

data/lib/rack/logstash/transport.rb

@@ -1,6 +1,7 @@
 require 'socket'
 require 'thread'
 require 'uri'
+require 'json'
 
 module Rack
 	class Logstash
@@ -12,10 +13,14 @@ module Rack
 				@sender  = sender_thread
 			end
 
-			def send(s)
+			def send(msg)
 				begin
-					@blmutex.synchronize { @backlog << s }
+					@blmutex.synchronize { @backlog << msg.to_json }
 					@sender.run
+				rescue EncodingError, JSON::JSONError => ex
+					$stderr.puts "Serialisation error: #{ex.message} (#{ex.class})"
+					$stderr.puts "Message: #{msg.inspect}"
+					$stderr.puts ex.backtrace.map { |l| "  #{l}" }
 				rescue StandardError => ex
 					$stderr.puts "Failed to send message: #{ex.message} (#{ex.class})"
 					$stderr.puts ex.backtrace.map { |l| "  #{l}" }

metadata

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