syslogstash 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85063132d60f932f245cee23fe386113bd2a470b
-  data.tar.gz: c4316c6c14830d325ee405dd30dabd26cd022071
+  metadata.gz: 0e2eed91a10f0ce2e5adede3c8639b37fc4becf3
+  data.tar.gz: b673ee85fcb7bfb6504aadf1941f27f1293dc1af
 SHA512:
-  metadata.gz: 726a84230a8d06d8fd1889a4e3d915aa9b1e662657b1d7f460f969aae34a1c3e74bba0e80eb962793547ff2ca0b0930926cdad7528a010b42eb5d9581b191f45
-  data.tar.gz: f4bbc3b3abfd71c74c05f5ba449081b8cff1c393f4862f94dcf00f156ac74ac5ba1cd4f8998aa4ea42d9bafdf3bf576e61d956e7eb1c15fbc6152e0cd00ac85a
+  metadata.gz: d02d4b1013baebd1aaccc6b11e1fcaf5f1afb4735e8fa272aef9246ec58c39e13ee963911795696264d5e3deaa5f2d5f0d80c9189f1275ba5bebbc6d2cc04fa1
+  data.tar.gz: b5f8d87359e5cf32a564db2d0966392deadb2038bbdc8bc55dc93921ab595b834947a114ba1390288ce7847c506af70b7ecd66ec47e396fc686bf1867d5de85c

data/lib/syslogstash.rb

@@ -1,6 +1,7 @@
 require 'uri'
 require 'socket'
 require 'json'
+require 'thwait'
 
 # Read syslog messages from one or more sockets, and send it to a logstash
 # server.
@@ -16,8 +17,27 @@ class Syslogstash
 		@writer.run
 		@readers.each { |w| w.run }
 
-		@writer.wait
-		@readers.each { |w| w.wait }
+		tw = ThreadsWait.new(@writer.thread, *(@readers.map { |r| r.thread }))
+
+		dead_thread = tw.next_wait
+
+		if dead_thread == @writer.thread
+			$stderr.puts "Writer thread crashed."
+			exit 1
+		else
+			reader = @readers.find { |r| r.thread == dead_thread }
+
+			$stderr.puts "Reader thread for #{reader.file} crashed."
+		end
+
+		begin
+			dead_thread.join
+		rescue Exception => ex
+			$stderr.puts "Exception in worker thread was: #{ex.message} (#{ex.class})"
+			$stderr.puts ex.backtrace.map { |l| "  #{l}" }.join("\n")
+		end
+
+		exit 1
 	end
 end
 

data/lib/syslogstash/logstash_writer.rb

@@ -11,7 +11,7 @@ class Syslogstash::LogstashWriter
 	# No messages will actually be *delivered*, though, until you call #run.
 	#
 	def initialize(servers, backlog)
-		@servers, @backlog = servers.map { |s| URI(s) }, @backlog
+		@servers, @backlog = servers.map { |s| URI(s) }, backlog
 
 		unless @servers.all? { |url| url.scheme == 'tcp' }
 			raise ArgumentError,

data/lib/syslogstash/syslog_reader.rb

@@ -5,8 +5,12 @@ require_relative 'worker'
 class Syslogstash::SyslogReader
 	include Syslogstash::Worker
 
+	attr_reader :file
+
 	def initialize(file, tags, logstash)
 		@file, @tags, @logstash = file, tags, logstash
+
+		log { "initializing syslog socket #{file} with tags #{tags.inspect}" }
 	end
 
 	# Start reading from the socket file, parsing entries, and flinging

data/lib/syslogstash/worker.rb

@@ -10,6 +10,10 @@ module Syslogstash::Worker
 		end
 	end
 
+	def thread
+		@worker
+	end
+
 	# If you want to wait for a reader to die, here's how.
 	#
 	def wait
@@ -19,12 +23,12 @@ module Syslogstash::Worker
 	private
 
 	def log
-		puts "#{Time.now.strftime("%F %T.%L")} #{self.class} #{yield.to_s}"
+		$stderr.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}"
+			$stderr.puts "#{Time.now.strftime("%F %T.%L")} #{self.class} #{yield.to_s}"
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syslogstash
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler