le 1.8.1 → 1.9

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	= "1.8.1"
+  s.version	= "1.9"
   s.date	= Time.now
   s.summary	= "Logentries plugin"
   s.description	=<<EOD

data/lib/le.rb

@@ -1,12 +1,3 @@
-#!/usr/bin/env ruby
-# coding: utf-8
-
-#
-# Logentries Ruby monitoring agent
-# Copyright 2010,2011 Logentries, Jlizard
-# Mark Lacomber <marklacomber@gmail.com>
-#
-
 require File.join(File.dirname(__FILE__), 'le', 'host')
 
 require 'logger'
@@ -20,19 +11,21 @@ module Le
    host = Le::Host.new(key, location, local)      
    logger = Logger.new(host)
    
-   logger.formatter = host.formatter
+   if host.respond_to?(:formatter)
+	logger.formatter = host.formatter
+   end
 
    logger  
  end
 
  def self.checkParams(key, location)
-	if key == nil or location == nil
-		puts "\nLE: Incorrect parameters for Logentries Plugin!\n"
-	end
-
-	# Check if the key is valid UUID format
-	if (key =~ /\A(urn:uuid:)?[\da-f]{8}-([\da-f]{4}-){3}[\da-f]{12}\z/i) == nil
-		puts "\nLE: It appears the LOGENTRIES_ACCOUNT_KEY you entered is invalid!\n"
-	end
+    if key == nil or location == nil
+       puts "\nLE: Incorrect parameters for Logentries Plugin!\n"
+    end
+ 
+    # Check if the key is valid UUID format
+    if (key =~ /\A(urn:uuid:)?[\da-f]{8}-([\da-f]{4}-){3}[\da-f]{12}\z/i) == nil
+       puts "\nLE: It appears the LOGENTRIES_ACCOUNT_KEY you entered is invalid!\n"
+    end
  end
 end

data/lib/le/host.rb

@@ -1,43 +1,35 @@
-#!/usr/bin/env ruby
-# coding: utf-8
-
-#
-# Logentries Ruby monitoring agent
-# Copyright 2010,2011 Logentries, Jlizard
-# Mark Lacomber <marklacomber@gmail.com>
-#
-
 module Le
   module Host
-    
-    # Creates a new Logentries host, based on a user-key and location of destination file on logentries,
-    # both must be provided correctly for a connection to be made.
 
     def self.new(key, location, local)
 
-      Le::Host::HTTPS.new(key, location, local)
+      Le::Host::HTTP.new(key, location, local)
       
     end
   
-    module HelperMethods
- 
+    module InstanceMethods
       def formatter
 	proc do |severity, datetime, progname, msg|
-	  message = "#{datetime} "
-          message << format_message(msg, severity)
-        end
-      end
+	  	message = "#{datetime} "
+      	message << format_message(msg, severity)
+    end
+	end
   
-      def format_message(msg_in, severity)
-	msg_out = ""
-	msg_out << "severity=#{severity}, "
+      def format_message(message_in, severity)
+		message_in = message_in.lstrip
 
-	msg_out << msg_in
-        
-	msg_out
+		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
 
-require File.join(File.dirname(__FILE__), 'host', 'https')
+require File.join(File.dirname(__FILE__), 'host', 'http')

data/lib/le/host/http.rb

@@ -0,0 +1,110 @@
+require 'socket'
+require 'openssl'
+require 'thread'
+require 'uri'
+
+module Le
+  module Host
+    class HTTP
+      include Le::Host::InstanceMethods
+      attr_accessor :key, :location, :queue, :started, :thread, :sock, :conn, :local
+
+      def initialize(key, location, local)
+		@key = key
+		@location = URI::encode(location)
+		@local = local
+        @queue = Queue.new
+		@started = false
+      end
+
+      def write(message)
+		if @local then
+		  puts message
+		  return
+		end
+
+		@queue << "#{message}\r\n"
+
+	    if not @started then
+			puts "LE: Starting asynchronous socket writer"
+			@thread = Thread.new{run()}
+			@started = true
+		end
+      end
+
+      def close
+		puts "LE: Closing asynchronous socket writer"
+		@thread.raise Interrupt
+      end
+
+	  def openConnection
+		addr = sprintf('/%s/hosts/%s/?realtime=1', @key, @location)
+
+		puts "LE: Reopening connection to Logentries API server"
+		@sock = TCPSocket.new('api.logentries.com', 443)
+
+		@conn = OpenSSL::SSL::SSLSocket.new(@sock, OpenSSL::SSL::SSLContext.new())
+		@conn.sync_close = true
+		@conn.connect
+
+		headers = sprintf("PUT %s HTTP/1.1\r\n\r\n", addr)
+		@conn.write(headers)
+
+		puts "LE: Connection established"
+	  end
+
+	  def reopenConnection
+		closeConnection
+		root_delay = 0.1
+		while true
+			begin
+				openConnection
+				break
+			rescue OpenSSL::SSL::SSLError, TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, EOFError => e
+				puts "LE: Unable to connect to Logentries"
+			end
+			root_delay *= 2
+			if root_delay >= 10 then
+				root_delay = 10
+			end
+			wait_for = (root_delay + rand(root_delay)).to_i
+			puts "LE: Waiting for " + wait_for.to_s + "ms"
+			sleep(wait_for)
+		end
+	  end
+
+	  def closeConnection
+		if @conn != nil
+			@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
+					begin
+						@conn.write(data)
+					rescue OpenSSL::SSL::SSLError, TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEOUT, EOFError => e
+						reopenConnection
+						next
+					end
+					break
+				end
+			end
+		rescue Interrupt 
+		  puts "LE: Asynchronous socket writer interrupted"
+		end
+		closeConnection
+	  end
+    end
+  end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: le
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 29
   prerelease: 
   segments: 
   - 1
-  - 8
-  - 1
-  version: 1.8.1
+  - 9
+  version: "1.9"
 platform: ruby
 authors: 
 - Mark Lacomber (Logentries)
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-17 00:00:00 Z
+date: 2012-07-25 00:00:00 Z
 dependencies: []
 
 description: |
@@ -31,8 +30,7 @@ extra_rdoc_files: []
 files: 
 - LE.gemspec
 - ./lib/le/host.rb
-- ./lib/le/host/https/tcp.rb
-- ./lib/le/host/https.rb
+- ./lib/le/host/http.rb
 - ./lib/le.rb
 homepage: 
 licenses: []

data/lib/le/host/https.rb

@@ -1,45 +0,0 @@
-#!/usr/bin/env ruby
-# coding: utf-8
-
-#
-# Logentries Ruby monitoring agent
-# Copyright 2010,2011 Logentries, Jlizard
-# Mark Lacomber <marklacomber@gmail.com>
-#
-
-require 'socket'
-require 'openssl'
-
-require File.join(File.dirname(__FILE__), 'https', 'tcp')
-
-module Le
-  module Host
-    class HTTPS
-      include Le::Host::HelperMethods	
-      
-      attr_reader :deliverer, :local_bool
-
-      def initialize(key, location, local)
-	@local_bool = local
-	if not local
-        	@deliverer = Le::Host::HTTPS::TCPSOCKET.new(key, location)
-        end   
-      end
-
-      def write(message)
-	
-	if @local_bool
-        	puts message
-        else
-        	# Deliver the message to logentries via TCP
-		@deliverer.deliver(message)
-	end
-      end
-
-      def close
-	nil
-      end
-    
-    end
-  end
-end

data/lib/le/host/https/tcp.rb

@@ -1,74 +0,0 @@
-#!/usr/bin/env ruby
-# coding: utf-8
-
-#
-# Logentries Ruby monitoring agent
-# Copyright 2010,2011 Logentries, Jlizard
-# Mark Lacomber <marklacomber@gmail.com>
-#
-
-module Le
-  module Host
-    class HTTPS
-
-      class TCPSOCKET
-
-	attr_accessor :sock, :conn, :key, :location
-	def initialize(key, location)
-
-          @key = key
-          @location = location
-	  begin
-          	createSocket(key, location)
-	  rescue OpenSSL::SSL::SSLError, TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, EOFError => e
-		$stderr.puts "WARNING: #{e.class} creating the connection to Logentries. #{e.message}"
-          end
-	end
-
-        def createSocket(key, location)
-	  
-          addr = sprintf('/%s/hosts/%s/?realtime=1', key, location)
-
-          # Open the TCP connection to the Logentries Server
-          @sock = TCPSocket.new('api.logentries.com', 443)
-
-          @conn = OpenSSL::SSL::SSLSocket.new(@sock, OpenSSL::SSL::SSLContext.new())
-          @conn.sync_close = true
-          @conn.connect
-
-          # Set up connection with Logentries API to receive messages in chunks, i.e, logs
-          request = sprintf("PUT %s HTTP/1.1\r\n", addr)
-          @conn.print(request)
-          @conn.print("Accept-Encoding: identity\r\n")
-          @conn.print("Transfer_Encoding: chunked\r\n\r\n")
-
-        end
-	
-	def deliver(message)
-
-          if @conn == nil
-             begin
-                createSocket(@key, @location)
-             rescue OpenSSL::SSL::SSLError, TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, EOFError => e
-                $stderr.puts "WARNING: #{e.class} Could not write log. No connection to Logentries #{e.message}"
-                return
-             end
-          end
-          # Sends the log to the Logentries Server
-          begin
-	    @conn.print(message + "\r\n")
-	  rescue OpenSSL::SSL::SSLError, TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ENOTCONN, Errno::ECONNRESET, Errno::ETIMEDOUT, EOFError => e
-	    $stderr.puts "WARNING: #{e.class} sending log #{e.message}"
-              begin
-                createSocket(@key, @location)
-              rescue OpenSSL::SSL::SSLError, TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, EOFError => e
-                $stderr.puts "WARNING: #{e.class} creating the connection to Logentries. #{e.message}"
-              end
-	  end
-        end
-	
-      end
-
-    end
-  end
-end