semantic_logger 0.6.0 → 0.6.1

data/README.md

@@ -285,7 +285,7 @@ For example to replace the Rails or Ruby text log formatter, in the environment
             end
           end
 
-          str = "#{log.time.strftime("%Y-%m-%d %H:%M:%S")}.#{"%03d" % (log.time.usec/1000)} #{log.level.to_s[0..0].upcase} [#{$$}:#{log.thread_name}] #{tags}#{log.name} -- #{message}"
+          str = "#{log.time.strftime("%Y-%m-%d %H:%M:%S")}.#{"%06d" % log.time.usec} #{"%-05s" % log.level.to_s.upcase} [#{$$}:#{log.thread_name}] #{tags}#{log.name} -- #{message}"
           str << " (#{'%.1f' % log.duration}ms)" if log.duration
           str
       end

data/lib/semantic_logger/base.rb

@@ -37,7 +37,7 @@ module SemanticLogger
           end
         end
 
-        str = "#{log.time.strftime("%Y-%m-%d %H:%M:%S")}.#{"%03d" % (log.time.usec/1000)} #{log.level.to_s[0..0].upcase} [#{$$}:#{log.thread_name}] #{tags}#{log.name} -- #{message}"
+        str = "#{SemanticLogger::Base.formatted_time(log.time)} #{log.level.to_s[0..0].upcase} [#{$$}:#{log.thread_name}] #{tags}#{log.name} -- #{message}"
         str << " (#{'%.1f' % log.duration}ms)" if log.duration
         str
       end
@@ -240,13 +240,26 @@ module SemanticLogger
 
     # For JRuby include the Thread name rather than its id
     if defined? Java
+      # Name of the current Thread
       def self.thread_name
         Java::java.lang::Thread.current_thread.name
       end
+
+      # Return the Time as a formatted string
+      # JRuby only supports time in ms
+      def self.formatted_time(time)
+        "#{time.strftime("%Y-%m-%d %H:%M:%S")}.#{"%03d" % (time.usec/1000)}"
+      end
     else
       def self.thread_name
         Thread.current.object_id
       end
+
+      # Return the Time as a formatted string
+      # Ruby MRI supports micro seconds
+      def self.formatted_time(time)
+        "#{time.strftime("%Y-%m-%d %H:%M:%S")}.#{"%06d" % (time.usec)}"
+      end
     end
 
     # Internal method to return the log level as an internal index

data/lib/semantic_logger/logger.rb

@@ -93,6 +93,31 @@ module SemanticLogger
       reply_queue.pop
     end
 
+    @@lag_check_interval = 1000
+    @@lag_threshold_s = 30
+
+    # Returns the check_interval which is the number of messages between checks
+    # to determine if the appender thread is falling behind
+    def self.lag_check_interval
+      @@lag_check_interval
+    end
+
+    # Set the check_interval which is the number of messages between checks
+    # to determine if the appender thread is falling behind
+    def self.lag_check_interval=(lag_check_interval)
+      @@lag_check_interval = lag_check_interval
+    end
+
+    # Returns the amount of time in seconds
+    # to determine if the appender thread is falling behind
+    def self.lag_threshold_s
+      @@lag_threshold_s
+    end
+
+    def self.time_threshold_s=(time_threshold_s)
+      @@lag_threshold_s = time_threshold_s
+    end
+
     ############################################################################
     protected
 
@@ -128,9 +153,18 @@ module SemanticLogger
       @@appender_thread = Thread.new do
         begin
           logger.debug "SemanticLogger::Logger Appender thread started"
+          count = 0
           while message=queue.pop
             if message.is_a? Log
               appenders.each {|appender| appender.log(message) }
+              count += 1
+              # Check every few log messages whether this appender thread is falling behind
+              if count > lag_check_interval
+                if (diff = Time.now - message.time) > lag_threshold_s
+                  logger.warn "SemanticLogger::Logger Appender thread has fallen behind by #{diff} seconds with #{cache_count} messages queued up. Consider reducing the log level or changing the appenders"
+                end
+                count = 0
+              end
             else
               case message[:command]
               when :shutdown

data/lib/semantic_logger/version.rb

@@ -1,3 +1,3 @@
 module SemanticLogger #:nodoc
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

data/test/appender_file_test.rb

@@ -48,5 +48,32 @@ class AppenderFileTest < Test::Unit::TestCase
       end
     end
 
+    context "custom formatter" do
+      setup do
+        @appender = SemanticLogger::Appender::File.new(@io) do |log|
+          message = log.message.to_s
+          tags = log.tags.collect { |tag| "[#{tag}]" }.join(" ") + " " if log.tags && (log.tags.size > 0)
+
+          if log.payload
+            if log.payload.is_a?(Exception)
+              exception = log.payload
+              message << " -- " << "#{exception.class}: #{exception.message}\n#{(exception.backtrace || []).join("\n")}"
+            else
+              message << " -- " << log.payload.inspect
+            end
+          end
+
+          str = "#{log.time.strftime("%Y-%m-%d %H:%M:%S")}.#{"%03d" % (log.time.usec/1000)} #{log.level.to_s.upcase} [#{$$}:#{log.thread_name}] #{tags}#{log.name} -- #{message}"
+          str << " (#{'%.1f' % log.duration}ms)" if log.duration
+          str
+        end
+      end
+
+      should "format using formatter" do
+        @appender.debug
+        assert_match /\d+-\d+-\d+ \d+:\d+:\d+.\d+ DEBUG \[\d+:#{@thread_name}\] SemanticLogger::Appender::File -- \n/, @io.string
+      end
+    end
+
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Reid Morrison