le 2.1.6 → 2.1.7

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

data/lib/le.rb

@@ -4,13 +4,18 @@ require 'logger'
 
 module Le
 
- def self.new(token, local=false, debug_level = Logger::DEBUG)
+ def self.new(token, options={})
 
    self.checkParams(token)
 
-   host = Le::Host.new(token, local)      
+   opt_local = options[:local] || false
+   opt_debug = options[:debug] || false
+   opt_log_level = options[:log_level] || Logger::DEBUG
+
+   host = Le::Host.new(token, opt_local, opt_debug)      
    logger = Logger.new(host)
-   logger.level = debug_level
+
+   logger.level = opt_log_level
    
    if host.respond_to?(:formatter)
 	logger.formatter = host.formatter

data/lib/le/host.rb

@@ -1,8 +1,8 @@
 module Le
   module Host
 
-    def self.new(token, local)
-      Le::Host::HTTP.new(token, local)
+    def self.new(token, local, debug)
+      Le::Host::HTTP.new(token, local, debug)
     end
 
     module InstanceMethods

data/lib/le/host/http.rb

@@ -7,9 +7,9 @@ module Le
   module Host
     class HTTP
       include Le::Host::InstanceMethods
-      attr_accessor :token, :queue, :started, :thread, :conn, :local
+      attr_accessor :token, :queue, :started, :thread, :conn, :local, :debug
 
-      def initialize(token, local)
+      def initialize(token, local, debug)
 		if defined?(Rails)
 			@logger_console = Logger.new("log/#{Rails.env}.log")
 		else
@@ -17,11 +17,30 @@ module Le
 		end
 		@token = token
 		@local = local
+		@debug = debug
 		@queue = Queue.new
 		@started = false
 		@thread = nil
+
+		if @debug then
+			self.init_debug
+		end
       end
 
+	  def init_debug
+			filePath = "logentriesGem.log"
+			if File.exist?('log/')
+				filePath = "log/logentriesGem.log"
+			end
+			@debug_logger = Logger.new(filePath)
+	  end
+
+	  def dbg(message)
+		if @debug then
+			@debug_logger.add(Logger::Severity::DEBUG,message)
+		end
+	  end
+
       def write(message)
 		if @local then
 			@logger_console.add(Logger::Severity::UNKNOWN,message)
@@ -38,27 +57,27 @@ module Le
 
 	  def start_async_thread
 		@thread = Thread.new{run()}
-		puts "LE: Asynchronous socket writer started"
+		dbg "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"
+			dbg "LE: Asyncrhonous socket writer restarted"
 		end
 	  end
 
       def close
-		puts "LE: Closing asynchronous socket writer"
+		dbg "LE: Closing asynchronous socket writer"
 		@started = false
       end
 
 	  def openConnection
-		puts "LE: Reopening connection to Logentries API server"
+		dbg "LE: Reopening connection to Logentries API server"
 		@conn = TCPSocket.new('api.logentries.com', 10000)
 
-		puts "LE: Connection established"
+		dbg "LE: Connection established"
 	  end
 
 	  def reopenConnection
@@ -69,14 +88,14 @@ module Le
 				openConnection
 				break
 			rescue TimeoutError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, EOFError => e
-				puts "LE: Unable to connect to Logentries"
+				dbg "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"
+			dbg "LE: Waiting for " + wait_for.to_s + "ms"
 			sleep(wait_for)
 		end
 	  end
@@ -103,7 +122,7 @@ module Le
 				break
 			end
 		end
-		puts "LE: Closing Asyncrhonous socket writer"
+		dbg "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.6
+  version: 2.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies: []
 description: ! '