le 1.9.2 → 2.0

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

data/lib/le.rb

@@ -13,11 +13,11 @@ require 'logger'
 
 module Le
 
- def self.new(key, location, local=false)
+ def self.new(token, local=false)
 
-   self.checkParams(key, location)
+   self.checkParams(token)
 
-   host = Le::Host.new(key, location, local)      
+   host = Le::Host.new(token, local)      
    logger = Logger.new(host)
    
    logger.formatter = host.formatter
@@ -25,14 +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"
+ def self.checkParams(token)
+	if token == nil
+		puts "\nLE: Incorrect token parameter 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"
+	if (token =~ /\A(urn:uuid:)?[\da-f]{8}-([\da-f]{4}-){3}[\da-f]{12}\z/i) == nil
+		puts "\nLE: It appears the LOGENTRIES_TOKEN you entered is invalid!\n"
 	end
  end
 end

data/lib/le/host.rb

@@ -13,9 +13,9 @@ module Le
     # 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)
+    def self.new(token, local)
 
-      Le::Host::HTTPS.new(key, location, local)
+      Le::Host::HTTPS.new(token, local)
       
     end
   
@@ -30,7 +30,6 @@ module Le
   
       def format_message(msg_in, severity)
 	msg_in = msg_in.lstrip
-	
 	msg_out = ""
 	msg_out << "severity=#{severity}, "
 
@@ -38,8 +37,8 @@ module Le
 	when String
 		msg_out << msg_in
 	else
-        msg_out << msg_in.inspect
-	end
+		msg_out << msg_in.inspect
+        end
 	msg_out
       end
     end

data/lib/le/host/https.rb

@@ -7,9 +7,6 @@
 # Mark Lacomber <marklacomber@gmail.com>
 #
 
-require 'socket'
-require 'openssl'
-
 require File.join(File.dirname(__FILE__), 'https', 'tcp')
 
 module Le
@@ -19,10 +16,10 @@ module Le
       
       attr_reader :deliverer, :local_bool
 
-      def initialize(key, location, local)
+      def initialize(token, local)
 	@local_bool = local
 	if not local
-        	@deliverer = Le::Host::HTTPS::TCPSOCKET.new(key, location)
+        	@deliverer = Le::Host::HTTPS::TCPSOCKET.new(token)
         end   
       end
 

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

@@ -7,39 +7,30 @@
 # Mark Lacomber <marklacomber@gmail.com>
 #
 
-require 'uri'
+require 'socket'
+require 'openssl'
 
 module Le
   module Host
     class HTTPS
+
       class TCPSOCKET
 
-	attr_accessor :sock, :conn, :key, :location
-	def initialize(key, location)
+	attr_accessor :conn, :token
+	def initialize(token)
 
-          @key = key
-          @location = URI::encode(location)
+          @token = token
 	  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}"
+          	createSocket()
+	  rescue TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, EOFError => e
+		$stderr.puts "WARNING: #{e.class} Could not create the connection to Logentries. #{e.message}"
           end
 	end
 
-        def createSocket(key, location)
-	  
-          addr = sprintf('/%s/hosts/%s/?realtime=1', key, location)
+        def createSocket()
 
           # 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\r\n", addr)
-          @conn.write(request)
+          @conn = TCPSocket.new('api.logentries.com', 10000)
 
         end
 	
@@ -47,21 +38,21 @@ module Le
 
           if @conn == nil
              begin
-                createSocket(@key, @location)
-             rescue OpenSSL::SSL::SSLError, TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, EOFError => e
+                createSocket()
+             rescue 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}"
+	    @conn.puts(@token + message)
+	  rescue TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ENOTCONN, Errno::ECONNRESET, Errno::ETIMEDOUT, EOFError => e
+	    $stderr.puts "WARNING: #{e.class} Could not send log to Logentries #{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}"
+                createSocket()
+              rescue TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, EOFError => e
+                $stderr.puts "WARNING: #{e.class} Could not create the connection to Logentries. #{e.message}"
               end
 	  end
         end

metadata

@@ -1,71 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: le
-version: !ruby/object:Gem::Version 
-  hash: 55
+version: !ruby/object:Gem::Version
+  version: '2.0'
   prerelease: 
-  segments: 
-  - 1
-  - 9
-  - 2
-  version: 1.9.2
 platform: ruby
-authors: 
+authors:
 - Mark Lacomber (Logentries)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-26 00:00:00 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies: []
+description: ! '
 
-description: |
-  
-
+'
 email: marklacomber@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LE.gemspec
+- ./lib/le.rb
 - ./lib/le/host.rb
-- ./lib/le/host/https/tcp.rb
 - ./lib/le/host/https.rb
-- ./lib/le.rb
+- ./lib/le/host/https/tcp.rb
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Logentries plugin
 test_files: []
-