le 2.1.2 → 2.1.3

data/LE.gemspec

@@ -3,7 +3,7 @@ require File.expand_path(File.join(dir, 'lib', 'le'))
 
 Gem::Specification.new do |s|
   s.name	= "le"
-  s.version	= "2.1.2"
+  s.version	= "2.1.3"
   s.date	= Time.now
   s.summary	= "Logentries plugin"
   s.description	=<<EOD

data/lib/le/host.rb

@@ -2,24 +2,33 @@ module Le
   module Host
 
     def self.new(token, local)
+
       Le::Host::HTTP.new(token, local)
+      
     end
-
+  
     module InstanceMethods
       def formatter
-        proc do |severity, datetime, _, msg|
-          message = "#{datetime} "
-          message << format_message(msg, severity)
-        end
-      end
-
+	proc do |severity, datetime, progname, msg|
+	  	message = "#{datetime} "
+      	message << format_message(msg, severity)
+    end
+	end
+  
       def format_message(message_in, severity)
-        message_in = message_in.inspect unless message_in.is_a?(String)
+		message_in = message_in.lstrip
 
-        "severity=#{severity}, #{message_in.lstrip}"
+		message_out = ""
+		message_out = "severity=#{severity}, "
+		case message_in
+		when String
+		  message_out << message_in
+		else
+		  message_out << message_in.inspect
+		end
+		message_out
       end
     end
-
   end
 end
 

data/lib/le/host/http.rb

@@ -12,8 +12,9 @@ module Le
       def initialize(token, local)
 		@token = token
 		@local = local
-        @queue = Queue.new
+		@queue = Queue.new
 		@started = false
+		@thread = nil
       end
 
       def write(message)
@@ -24,25 +25,35 @@ module Le
 
 		@queue << "#{@token}#{message}\n"
 
-	    if not @started then
-			puts "LE: Starting asynchronous socket writer"
-			@thread = Thread.new{run()}
-			@started = true
+		if @started then
+			check_async_thread
+		else
+			start_async_thread
 		end
       end
 
+	  def start_async_thread
+		@thread = Thread.new{run()}
+		puts "LE: Asynchronous socket writer started"
+		@started = true
+	  end
+
+	  def check_async_thread
+		if not @thread.alive?
+			@thread = Thread.new{run()}
+			puts "LE: Asyncrhonous socket writer restarted"
+		end
+	  end
+
       def close
 		puts "LE: Closing asynchronous socket writer"
-		@thread.raise Interrupt
+		@started = false
       end
 
 	  def openConnection
 		puts "LE: Reopening connection to Logentries API server"
 		@conn = TCPSocket.new('api.logentries.com', 10000)
 
-		#@conn = OpenSSL::SSL::SSLSocket.new(@sock, OpenSSL::SSL::SSLContext.new())
-		#@conn.connect
-
 		puts "LE: Connection established"
 	  end
 
@@ -53,7 +64,7 @@ module Le
 			begin
 				openConnection
 				break
-			rescue OpenSSL::SSL::SSLError, TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, EOFError => e
+			rescue TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, EOFError => e
 				puts "LE: Unable to connect to Logentries"
 			end
 			root_delay *= 2
@@ -71,31 +82,24 @@ module Le
 			@conn.sysclose
 			@conn = nil
 		end
-		#if @sock != nil
-		#	@sock.close
-		#	@sock = nil
-		#end
 	  end
 
 	  def run
-		begin
 		reopenConnection
 
+		while true
+			data = @queue.pop
 			while true
-				data = @queue.pop
-				while true
-					begin
-						@conn.write(data)
-					rescue OpenSSL::SSL::SSLError, TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEOUT, EOFError => e
-						reopenConnection
-						next
-					end
-					break
+				begin
+					@conn.write(data)
+				rescue TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEOUT, EOFError => e
+					reopenConnection
+					next
 				end
+				break
 			end
-		rescue Interrupt 
-		  puts "LE: Asynchronous socket writer interrupted"
 		end
+		puts "LE: Closing Asyncrhonous socket writer"
 		closeConnection
 	  end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: le
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-31 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies: []
 description: ! '