syslogstash 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8dd70d42345ffba77d56d3511d5220e2ab399ce9
-  data.tar.gz: 98f6175cd0cc98d9ca6a51593657b7e3c09f178c
+SHA256:
+  metadata.gz: f27f4b8bc47949fc01e4cfd9bcb596fdea9143516326e8eb4d129bc8e16b9897
+  data.tar.gz: 176a5842fcee9deb2acc965f5886ce2c36a71a6b8482d37179e63b12e50bf7b1
 SHA512:
-  metadata.gz: 9fe1db70bce8d062dbc84b3c24e5650ed489b9ff89f7502225b2673f848e3c4abde63d6369cd14b3235f1adb9bfb15ceb8b217eaf4392a52badbfdd906ecbf03
-  data.tar.gz: 1e4163fa6ccd9c6f6402be87d571f1d67e80584935e7a7772084f3c3dc968f321acbdd0f2ecf7065f9b5f295825d2dd9f997189f7866cd0b9847dc03152a3224
+  metadata.gz: ad2ebf46bfcc956a0cc88f67bd651856843aed2ca7b4714cc275951a4dd8443d4c674d50dc0b302ed0a50357fdbf4f444acce710b92d02b0cc1b8cec9279d4d1
+  data.tar.gz: a154a28707c4120e0ea4ff920f76557beaa103d52d6121db3973f6a52d819ee8a83bb3e396ab68f536424c8182e4842756131dbfe595d2a3260c7ed42b38c749

data/README.md

@@ -85,6 +85,13 @@ aspects of runtime operation.  They are:
 * **`SIGURG`** -- toggle whether or not relaying to stdout is enabled or
   disabled.
 
+* **`SIGHUP`** -- pretend that the currently in-use logstash server has
+  failed, and trigger the random-server-selection logic to (potentially)
+  pick a new server.  Useful if you want to make sure that syslogstash
+  won't drop *any* messages when retiring a logstash server -- just remove
+  the logstash server from DNS, then SIGHUP syslogstash to make it switch
+  to another server.
+
 
 ## Use with Docker
 

data/bin/syslogstash

@@ -19,13 +19,16 @@ syslogstash = Syslogstash.new(cfg)
 sig_r, sig_w = IO.pipe
 
 Signal.trap("USR1") do
-	sig_w.print '1'
+  sig_w.print '1'
 end
 Signal.trap("USR2") do
-	sig_w.print '2'
+  sig_w.print '2'
 end
 Signal.trap("URG") do
-	sig_w.print 'U'
+  sig_w.print 'U'
+end
+Signal.trap("HUP") do
+  sig_w.print 'H'
 end
 
 Thread.new do
@@ -41,6 +44,9 @@ Thread.new do
       elsif c == 'U'
         cfg.relay_to_stdout = !cfg.relay_to_stdout
         logger.info("SignalHandler") { "Received SIGURG; Relaying to stdout is now #{cfg.relay_to_stdout ? "enabled" : "disabled"}" }
+      elsif c== 'H'
+        logger.info("SignalHandler") { "Received SIGHUP" }
+        syslogstash.force_disconnect!
       else
         logger.error("SignalHandler") { "Got an unrecognised character from signal pipe: #{c.inspect}" }
       end

data/lib/syslogstash.rb

@@ -43,6 +43,10 @@ class Syslogstash
 
 		exit 1
 	end
+
+	def force_disconnect!
+		@writer.force_disconnect!
+	end
 end
 
 require_relative 'syslogstash/config'

data/lib/syslogstash/logstash_writer.rb

@@ -19,6 +19,7 @@ class Syslogstash::LogstashWriter
 
 		@entries = []
 		@entries_mutex = Mutex.new
+		@cs_mutex = Mutex.new
 	end
 
 	# Add an entry to the list of messages to be sent to logstash.  Actual
@@ -45,6 +46,16 @@ class Syslogstash::LogstashWriter
 		@thread = Thread.new { send_messages }
 	end
 
+	# Cause the writer to disconnect from the currently-active server.
+	#
+	def force_disconnect!
+		@cs_mutex.synchronize do
+			@logger.info("writer") { "Forced disconnect from #{server_id(@current_server) }" }
+			@current_server.close if @current_server
+			@current_server = nil
+		end
+	end
+
 	private
 
 	def send_messages
@@ -87,38 +98,41 @@ class Syslogstash::LogstashWriter
 		done = false
 
 		until done
-			if @current_server
-				begin
-					@logger.debug("writer") { "Using current server #{server_id(@current_server)}" }
-					yield @current_server
-					done = true
-				rescue SystemCallError => ex
-					# Something went wrong during the send; disconnect from this
-					# server and recycle
-					@logger.debug("writer") { "Error while writing to current server: #{ex.message} (#{ex.class})" }
-					@current_server.close
-					@current_server = nil
-					sleep 0.1
-				end
-			else
-				candidates = resolve_server_name
-
-				begin
-					next_server = candidates.shift
-
-					if next_server
-						@logger.debug("writer") { "Trying to connect to #{next_server.to_s}" }
-						@current_server = TCPSocket.new(next_server.hostname, next_server.port)
-					else
-						@logger.debug("writer") { "Could not connect to any server; pausing before trying again" }
+			@cs_mutex.synchronize do
+				if @current_server
+					begin
+						@logger.debug("writer") { "Using current server #{server_id(@current_server)}" }
+						yield @current_server
+						done = true
+					rescue SystemCallError => ex
+						# Something went wrong during the send; disconnect from this
+						# server and recycle
+						@logger.debug("writer") { "Error while writing to current server: #{ex.message} (#{ex.class})" }
+						@current_server.close
 						@current_server = nil
-						sleep 5
+						sleep 0.1
+					end
+				else
+					candidates = resolve_server_name
+					@logger.debug("writer") { "Server candidates: #{candidates.inspect}" }
+
+					begin
+						next_server = candidates.shift
+
+						if next_server
+							@logger.debug("writer") { "Trying to connect to #{next_server.to_s}" }
+							@current_server = TCPSocket.new(next_server.hostname, next_server.port)
+						else
+							@logger.debug("writer") { "Could not connect to any server; pausing before trying again" }
+							@current_server = nil
+							sleep 5
+						end
+					rescue SystemCallError => ex
+						# Connection failed for any number of reasons; try the next one in the list
+						@logger.warn("writer") { "Failed to connect to #{next_server.to_s}: #{ex.message} (#{ex.class})" }
+						sleep 0.1
+						retry
 					end
-				rescue SystemCallError => ex
-					# Connection failed for any number of reasons; try the next one in the list
-					@logger.warn("writer") { "Failed to connect to #{next_server.to_s}: #{ex.message} (#{ex.class})" }
-					sleep 0.1
-					retry
 				end
 			end
 		end
@@ -145,7 +159,7 @@ class Syslogstash::LogstashWriter
 			if addrs.empty?
 				@logger.warn("writer") { "No addresses resolved for server_name #{host.inspect}" }
 			end
-			addrs.map { |a| Target.new(a.to_s, port.to_i) }
+			addrs.sort_by { rand }.map { |a| Target.new(a.to_s, port.to_i) }
 		else
 			# SRV records ftw
 			[].tap do |list|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: syslogstash
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-21 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: frankenstein
@@ -223,9 +223,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Send messages from syslog UNIX sockets to logstash
 test_files: []
-has_rdoc: