semantic_logger 0.1.0 → 0.2.0

data/lib/semantic_logger/appender/logger.rb

@@ -51,7 +51,7 @@ module SemanticLogger
           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}] #{log.name} -- #{message}\n"
-          str << " (#{log.duration}ms)" if log.duration
+          str << " (#{'%.1f' % log.duration}ms)" if log.duration
           str
         end
       end

data/lib/semantic_logger/logger.rb

@@ -108,13 +108,21 @@ module SemanticLogger
           @level_index <= #{index}
         end
 
+        # Log the duration of the supplied block
+        #   If an exception occurs in the block the exception is logged using the
+        #   same log level. The exception will flow through to the caller unchanged
         def benchmark_#{level}(message, payload = nil)
           raise "Mandatory block missing" unless block_given?
           if @level_index <= #{index}
             start = Time.now
-            result = yield
-            self.class.queue << Log.new(:#{level}, self.class.thread_name, name, message, payload, start, Time.now - start)
-            result
+            begin
+              result = yield
+              self.class.queue << Log.new(:#{level}, self.class.thread_name, name, message, payload, start, Time.now - start)
+              result
+            rescue Exception => exc
+              self.class.queue << Log.new(:#{level}, self.class.thread_name, name, message, exc, start, Time.now - start)
+              raise exc
+            end
           else
             yield
           end
@@ -216,7 +224,7 @@ module SemanticLogger
           # #TODO Logger needs it's own "reliable" appender ;)
           # For example if an appender constantly fails
           # ( bad filename or path, invalid server )
-          logger.debug "SemanticLogger::Logger Appender Thread Started"
+          logger.debug "SemanticLogger::Logger Appender thread started"
           while message=queue.pop
             if message.is_a? Log
               appenders.each {|appender| appender.log(message) }
@@ -235,10 +243,11 @@ module SemanticLogger
             end
           end
         rescue Exception => exception
-          logger.fatal "SemanticLogger::Logger Appender Thread crashed: #{exception.class}: #{exception.message}\n#{(exception.backtrace || []).join("\n")}"
-          exit(-2)
+          logger.error "SemanticLogger::Logger Appender thread restarting due to exception: #{exception.class}: #{exception.message}\n#{(exception.backtrace || []).join("\n")}"
+          # Start a new appender thread and let this one terminate
+          startup
         ensure
-          logger.debug "SemanticLogger::Logger Appender Thread stopped"
+          logger.debug "SemanticLogger::Logger Appender thread stopped"
         end
       end
     end
@@ -250,7 +259,11 @@ module SemanticLogger
       logger.debug "SemanticLogger::Logger Shutdown. Stopping appender thread"
       reply_queue = Queue.new
       queue << { :command => :shutdown, :reply_queue => reply_queue }
-      reply_queue.pop
+      result = reply_queue.pop
+      # Undefine the class variable for the queue since in test environments
+      # at_exit can be invoked multiple times
+      remove_class_variable(:@@queue)
+      result
     end
 
   end

data/lib/semantic_logger/version.rb

@@ -1,3 +1,3 @@
 module SemanticLogger #:nodoc
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Reid Morrison
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-17 00:00:00 -04:00
+date: 2012-08-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency