syslogstash 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d3e431ae7c66eafbe07686b87f012d63bc563e1
-  data.tar.gz: 29156c243ffbc6c4b84aaa92105f2db286c239ca
+  metadata.gz: 57f9a03e8075654fe964cc2fd0da045912296789
+  data.tar.gz: 2e6e1b3264305e47a55d5fd9b275527e4e7b57dc
 SHA512:
-  metadata.gz: 51a912d37ea4eb14891eb6256bc6d0465e0eab7afd53e057951fc83cedcc8be39b35b22c1f97492cae32ad5f320d36a89c8ae9017faa4abacdfcf2c83a412aa0
-  data.tar.gz: a3d81b2f2195f005f2665fb470f644f38360713ce51f8ac163c0f826d5d598d39539643e6df919dcef575f0b28298afcb89e00a784d309ab0d31a4ee77741390
+  metadata.gz: 7be74a42eb0f2970cf47872c0d83a2a52fe5ab8d1e739e1951759ec70ce8bf6f5987fb47915691fa172c67f2fd2a5ab93099afe66d62264434a37f9102bad080
+  data.tar.gz: be5027ec85b4e32364a5a5f0101160b41634d76691c0271730f1599b83de6291d1ad747413613a1c2a6ad996865f3fa0f176cd22c1064c09e7788117bc4a9d97

data/lib/syslogstash/logstash_writer.rb

@@ -56,6 +56,9 @@ class Syslogstash::LogstashWriter
 					# If we got here, we sent successfully, so we don't want
 					# to put the entry back on the queue in the ensure block
 					entry = nil
+				rescue StandardError => ex
+					$stderr.puts "Unhandled exception: #{ex.message} (#{ex.class})"
+					$stderr.puts ex.backtrace.map { |l| "  #{l}" }.join("\n")
 				ensure
 					@entries_mutex.synchronize { @entries.unshift if entry }
 				end

data/lib/syslogstash/syslog_reader.rb

@@ -19,8 +19,9 @@ class Syslogstash::SyslogReader
 		begin
 			socket = Socket.new(Socket::AF_UNIX, Socket::SOCK_DGRAM, 0)
 			socket.bind(Socket.pack_sockaddr_un(@file))
-		rescue Errno::EEXIST
-			File.unlink(@file)
+		rescue Errno::EEXIST, Errno::EADDRINUSE
+			log { "socket file #{@file} already exists; deleting"
+			File.unlink(@file) rescue nil
 			retry
 		rescue SystemCallError
 			$stderr.puts "Error while trying to bind to #{@file}"
@@ -36,6 +37,7 @@ class Syslogstash::SyslogReader
 				end
 			ensure
 				socket.close
+				log { "removing socket file #{@file}"
 				File.unlink(@file) rescue nil
 			end
 		end
@@ -74,7 +76,7 @@ class Syslogstash::SyslogReader
 				facility:         facility,
 				hostname:         hostname,
 				program:          program,
-				pid:              pid,
+				pid:              pid.nil? ? nil : pid.to_i,
 				message:          message,
 			).to_json
 
@@ -89,13 +91,11 @@ class Syslogstash::SyslogReader
 			e['@version']   = '1'
 			e['@timestamp'] = Time.now.utc.strftime("%FT%T.%LZ")
 
-			h['facility_name'] = FACILITIES[h[:facility]]
-			h['severity_name'] = SEVERITIES[h[:severity]]
+			h[:facility_name] = FACILITIES[h[:facility]]
+			h[:severity_name] = SEVERITIES[h[:severity]]
 
 			e.merge!(h.delete_if { |k,v| v.nil? })
 
-			e[:pid] = e[:pid].to_i if e.has_key?(:pid)
-
 			e.merge!(@tags) if @tags.is_a? Hash
 
 			debug { "Log entry is: #{e.inspect}" }

data/lib/syslogstash/worker.rb

@@ -18,6 +18,10 @@ module Syslogstash::Worker
 
 	private
 
+	def log
+		puts "#{Time.now.strftime("%F %T.%L")} #{self.class} #{yield.to_s}"
+	end
+
 	def debug
 		if ENV['DEBUG_SYSLOGSTASH']
 			puts "#{Time.now.strftime("%F %T.%L")} #{self.class} #{yield.to_s}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syslogstash
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-13 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler