le 1.4 → 1.4.5

data/LE.gemspec

@@ -1,9 +1,9 @@
 dir = File.dirname(__FILE__)
-require File.expand_path(File.join(dir, 'lib1.2backup', 'le'))
+require File.expand_path(File.join(dir, 'lib', 'le'))
 
 Gem::Specification.new do |s|
   s.name	= "le"
-  s.version	= "1.4"
+  s.version	= "1.4.5"
   s.date	= Time.now
   s.summary	= "Logentries plugin"
   s.description	=<<EOD
@@ -13,7 +13,7 @@ EOD
   s.authors	= ["Mark Lacomber (Logentries)"]
   s.email	= "marklacomber@gmail.com"
   
-  s.files	= %w{ LE.gemspec } + Dir["#{dir}/lib1.2backup/**/*.rb"]
-  s.require_paths = ["lib1.2backup"]
+  s.files	= %w{ LE.gemspec } + Dir["#{dir}/lib/**/*.rb"]
+  s.require_paths = ["lib"]
 
 end

data/{lib1.2backup → lib}/le.rb

@@ -1,4 +1,12 @@
-#This will be the main le script
+#!/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'

data/{lib1.2backup → lib}/le/host.rb

@@ -1,4 +1,12 @@
-#this is the client page
+#!/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
     

data/{lib1.2backup → lib}/le/host/https.rb

@@ -1,3 +1,12 @@
+#!/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'
 

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

@@ -0,0 +1,75 @@
+#!/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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: le
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 4
-  version: "1.4"
+  - 5
+  version: 1.4.5
 platform: ruby
 authors: 
 - Mark Lacomber (Logentries)
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-20 00:00:00 Z
+date: 2011-08-09 00:00:00 Z
 dependencies: []
 
 description: |
@@ -29,10 +30,10 @@ extra_rdoc_files: []
 
 files: 
 - LE.gemspec
-- ./lib1.2backup/le.rb
-- ./lib1.2backup/le/host.rb
-- ./lib1.2backup/le/host/https.rb
-- ./lib1.2backup/le/host/https/tcp.rb
+- ./lib/le.rb
+- ./lib/le/host.rb
+- ./lib/le/host/https.rb
+- ./lib/le/host/https/tcp.rb
 homepage: 
 licenses: []
 
@@ -40,7 +41,7 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib1.2backup
+- lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 

data/lib1.2backup/le/host/https/tcp.rb

@@ -1,41 +0,0 @@
-module Le
-  module Host
-    class HTTPS
-
-      class TCPSOCKET
-
-	attr_accessor :sock, :conn
-	def initialize(key, location)
-
-          # Create the unique address comprising of user-key and location of file on logentries server
-	  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)
-
-          # Sends the log to the Logentries Server
-          begin
-	    @conn.print(message + "\r\n")
-	  rescue OpenSSL::SSL::SSLError, TimeoutError, Errno::ECONNRESET, EOFError => e
-	    $stderr.puts "WARNING: #{e.class} sending log #{message}"
-	  end
-        end
-	
-      end
-
-    end
-  end
-end