le 1.8 → 1.8.1

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

data/lib/le.rb

@@ -15,8 +15,9 @@ module Le
 
  def self.new(key, location, local=false)
 
+   self.checkParams(key, location)
+
    host = Le::Host.new(key, location, local)      
-   
    logger = Logger.new(host)
    
    logger.formatter = host.formatter
@@ -24,4 +25,14 @@ module Le
    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
+ end
 end

data/lib/le/host/https.rb

@@ -9,7 +9,6 @@
 
 require 'socket'
 require 'openssl'
-require 'logger'
 
 require File.join(File.dirname(__FILE__), 'https', 'tcp')
 
@@ -21,20 +20,20 @@ module Le
       attr_reader :deliverer, :local_bool
 
       def initialize(key, location, local)
-		@local_bool = local
-		if not @local_bool
-        	@deliverer = Le::Host::HTTPS::TCPSOCKET.new(key, location)   
-		end
+	@local_bool = local
+	if not local
+        	@deliverer = Le::Host::HTTPS::TCPSOCKET.new(key, location)
+        end   
       end
 
       def write(message)
-
-		if @local_bool
+	
+	if @local_bool
         	puts message
-		else
-			# Deliver the message to logentries via TCP if not testing locally
-			@deliverer.deliver(message)
-		end
+        else
+        	# Deliver the message to logentries via TCP
+		@deliverer.deliver(message)
+	end
       end
 
       def close

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

@@ -58,8 +58,7 @@ module Le
           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}"
+	    $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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: le
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 53
   prerelease: 
   segments: 
   - 1
   - 8
-  version: "1.8"
+  - 1
+  version: 1.8.1
 platform: ruby
 authors: 
 - Mark Lacomber (Logentries)
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-12 00:00:00 Z
+date: 2012-07-17 00:00:00 Z
 dependencies: []
 
 description: |