mee-rfc5424 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b64aa276950368440556ed5d17ac7c27df6f48f5
-  data.tar.gz: a86c909f14e6d38c3a990356f7670d025b6bb98e
+  metadata.gz: 78619957dcd9f1f40312b3223002b15fbb6e14c3
+  data.tar.gz: 7ea268131d410532d12693d8ab98cff6c8868701
 SHA512:
-  metadata.gz: f5027bff62db8c2d5d7aa4f812de5a23c41a85f9a58e530c6ce5c71c0e20e9232901feada91232cbbb13487e0dde6f6eccbbb001af9591bde89187d3bf7b29a1
-  data.tar.gz: 82489524b6085c92b3147c4e77aa32ebe4014a0bef0555178cfebf499dcef019c770ad99adc34f1d84cda79ec18606dcfc14fdc8e2be0392b4d4ea2bdd4b2583
+  metadata.gz: dcf3075b3dd90fd765cbbe37eb9ae2ce63d71099b7ac5483b967319c0d5c5b131c5e3c0862cb3ab6626b6a2f8494aae9af2511a799a29cc0f908da83e41179f9
+  data.tar.gz: d298053e73c104cffb7078be36dd45022cef51f871f3d3e1af0d4b099c5120545db5f42788dc90a0079c116e234040d2eb803cc19f1f9737c8b2f0e346c01e35

data/README.md

@@ -1,4 +1,4 @@
-# MEE::Rfc5424
+# MEE::RFC5424
 
 Ruby loggger capable of logging against Syslog (RFC5424) over TCP and Syslog over TLS.  Logs may be in either non-transparent newline framing or octet counting framing.
 
@@ -44,11 +44,9 @@ logger.info { "TLS message logging" }
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/mee-rfc5424.
+Bug reports and pull requests are welcome on GitHub at https://github.com/meschbach/mee-rfc5424.
 
 ## Licensing
 

data/lib/mee/rfc5424.rb

@@ -10,7 +10,7 @@ require 'time'
 module MEE
   module RFC5424
 		class Meta
-			attr_accessor :host, :proc_name, :facility, :pid
+			attr_accessor :host, :proc_name, :facility, :pid, :when
 
 			def initialize( props = {})
 				self.host = props[:host] || Socket.gethostname
@@ -21,7 +21,7 @@ module MEE
 
 			def header( params = {} )
 				severity = params[:severity] || Syslog::LOG_INFO
-				when_date = (params[:when] || DateTime.now).new_offset( 0 )
+				when_date = (@when || (params[:when] || DateTime.now) ).new_offset( 0 )
 				formatted_when = when_date.strftime("%FT%T.%3NZ")
 				priority = (facility * 8) + severity
 				"<#{priority}>1 #{formatted_when} #{self.host} #{proc_name} #{self.pid} - - \xEF\xBB\xBF"
@@ -58,14 +58,50 @@ module MEE
 			end
 		end
 
+		class TCPFactory
+			def initialize( host, port )
+				@host = host
+				@port = port
+			end
+
+			def dial()
+				target = TCPSocket.new( @host, @port )
+				target
+			end
+		end
+
+		class TLSFactory < TCPFactory
+			def initialize( host, port )
+				super
+			end
+
+			def dial()
+				clear_text_transport = super
+				secure_transport = OpenSSL::SSL::SSLSocket.new clear_text_transport
+				secure_transport.connect
+				secure_transport
+			end
+		end
+
 		class SocketTransport
-			attr_accessor :socket
-			def initialize( socket )
-				self.socket = socket
+			attr_accessor :factory, :socket
+			def initialize( factory )
+				self.factory = factory
 			end
 
 			def send_frame( frame )
-				socket.write( frame )
+				self.socket = self.factory.dial() unless self.socket
+				retrying = false
+				begin
+					socket.write( frame )
+				rescue Exception
+					self.socket.close()
+					self.socket = self.factory.dial() unless self.socket
+					if !retrying
+						retrying = true
+						retry
+					end
+				end
 			end
 		end
 
@@ -87,16 +123,12 @@ module MEE
 		end
 
 		def self.tcp( host, port )
-			target = TCPSocket.new( host, port )
-			protocol = SyslogClient.new( SocketTransport.new( target ) )
+			protocol = SyslogClient.new( SocketTransport.new( TCPFactory.new( host, port ) ) )
 			LoggerProtocolAdapter.new( protocol )
 		end
 
 		def self.tls( host, port )
-			raw_transport = TCPSocket.new( host, port )
-			secure_transport = OpenSSL::SSL::SSLSocket.new raw_transport
-			secure_transport.connect
-			protocol = SyslogClient.new( SocketTransport.new( secure_transport )  )
+			protocol = SyslogClient.new( SocketTransport.new( TLSFactory.new( host, port ) )  )
 			LoggerProtocolAdapter.new( protocol )
 		end
   end

data/lib/mee/rfc5424/version.rb

@@ -1,5 +1,5 @@
 module MEE
   module RFC5424
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mee-rfc5424
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Mark Eschbach
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler