semantic_logger 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd64eb04f0be456dd95ec325d6ac00af3dba49c1
-  data.tar.gz: 2d48aa4423c72c71ba7cf42e370d4dd5b21adc47
+  metadata.gz: e40f9cdb04c659a6463e341124bfa599fc6e1573
+  data.tar.gz: 837e26e9d736231379778a1dc031a3aa1a9b1da5
 SHA512:
-  metadata.gz: 6dc6dca8b8c4553acedbcc639f5daaeee367043816d23ad6816a0be9360b8529df18a3145fb0717b06a8964d1028bdccf61117e6edcfe5a1f719882cb7058c0b
-  data.tar.gz: e552b8b33ef2b967c3d18321cb8f1dd9e2d3173a57eaef32f3e25261767b0864ba6735d54e12a4ceb3dc0e7038077f10727fc72eb049130336b04621bcda7d2b
+  metadata.gz: 0289dacbdb9bdee70f9efe3b2203f7452863305cb562237c2067ec434739a8ae0af7b04eb14b57aff79f8783c3d7fc414f59890dcf2445fb229a6ed0139b7c48
+  data.tar.gz: a50be52d3059bef02aa2d77080dee298c28d02f6da1b4d749f678511285af4be64a6849a385f4cfbef5ed993b58ee5743a0ba164249fac9db3b7ae84ed22a0ac

data/Rakefile

@@ -5,28 +5,11 @@ require 'rubygems'
 require 'rubygems/package'
 require 'rake/clean'
 require 'rake/testtask'
-require 'date'
 require 'semantic_logger/version'
 
 desc "Build gem"
 task :gem  do |t|
-  gemspec = Gem::Specification.new do |spec|
-    spec.name        = 'semantic_logger'
-    spec.version     = SemanticLogger::VERSION
-    spec.platform    = Gem::Platform::RUBY
-    spec.authors     = ['Reid Morrison']
-    spec.email       = ['reidmo@gmail.com']
-    spec.homepage    = 'https://github.com/ClarityServices/semantic_logger'
-    spec.date        = Date.today.to_s
-    spec.summary     = "Improved logging for Ruby"
-    spec.description = "Semantic Logger takes logging in Ruby to a new level by adding several new capabilities to the commonly used Logging API"
-    spec.files       = FileList["./**/*"].exclude(/\.gem$/, /\.log$/,/nbproject/).map{|f| f.sub(/^\.\//, '')}
-    spec.license     = "Apache License V2.0"
-    spec.has_rdoc    = true
-    spec.add_dependency 'sync_attr', '>= 1.0'
-    spec.add_dependency 'thread_safe', '>= 0.1.0'
-  end
-  Gem::Package.build gemspec
+  Gem::Package.build(Gem::Specification.load('semantic_logger.gemspec'))
 end
 
 desc "Run Test Suite"

data/lib/semantic_logger/appender/base.rb

@@ -8,6 +8,21 @@
 #
 module SemanticLogger
   module Appender
+
+    # Formatting & colors used by optional colorized_formatter
+    module AnsiColors
+      CLEAR   = "\e[0m"
+      BOLD    = "\e[1m"
+      BLACK   = "\e[30m"
+      RED     = "\e[31m"
+      GREEN   = "\e[32m"
+      YELLOW  = "\e[33m"
+      BLUE    = "\e[34m"
+      MAGENTA = "\e[35m"
+      CYAN    = "\e[36m"
+      WHITE   = "\e[37m"
+    end
+
     class Base < SemanticLogger::Base
       attr_accessor :formatter
 
@@ -29,6 +44,39 @@ module SemanticLogger
         end
       end
 
+      # Optional log formatter to colorize log output
+      # To use this formatter
+      #   SemanticLogger.add_appender($stdout, nil, &SemanticLogger::Logger.colorized_formatter)
+      #
+      #    2011-07-19 14:36:15.660 D [1149:ScriptThreadProcess] Rails -- Hello World
+      def self.colorized_formatter
+        Proc.new do |log|
+          colors = SemanticLogger::Appender::AnsiColors
+          tags = log.tags.collect { |tag| "[#{colors::CYAN}#{tag}#{colors::CLEAR}]" }.join(' ') + ' ' if log.tags && (log.tags.size > 0)
+
+          message = log.message.to_s.dup
+          message << " -- " << log.payload.inspect if log.payload
+          message << " -- " << "#{colors::BOLD}#{log.exception.class}: #{log.exception.message}#{colors::CLEAR}\n#{(log.exception.backtrace || []).join("\n")}" if log.exception
+
+          duration_str = log.duration ? "(#{colors::BOLD}#{'%.1f' % log.duration}ms#{colors::CLEAR}) " : ''
+
+          level_color = case log.level
+          when :trace
+            colors::MAGENTA
+          when :debug
+            colors::CYAN
+          when :info
+            colors::GREEN
+          when :warn
+            colors::YELLOW
+          when :error, :fatal
+            colors::RED
+          end
+
+          "#{SemanticLogger::Appender::Base.formatted_time(log.time)} #{level_color}#{colors::BOLD}#{log.level.to_s[0..0].upcase}#{colors::CLEAR} [#{$$}:#{log.thread_name}] #{tags}#{duration_str}#{level_color}#{log.name}#{colors::CLEAR} -- #{message}"
+        end
+      end
+
       ############################################################################
       protected
 

data/lib/semantic_logger/base.rb

@@ -161,22 +161,20 @@ module SemanticLogger
     # Returns [Array] of [String] tags currently active for this thread
     # Returns nil if no tags are set
     def tags
-      Thread.current[:semantic_logger_tags]
+      Thread.current[:semantic_logger_tags] ||= []
     end
 
     # Add tags to the current scope
     #   To support: ActiveSupport::TaggedLogging V4 and above
     def push_tags *tags
       # Check for nil tags
-      Thread.current[:semantic_logger_tags] = (self.tags || []) + tags if tags
+      Thread.current[:semantic_logger_tags] = self.tags.concat(tags)
     end
 
     # Remove specified number of tags from the current tag list
     #   To support: ActiveSupport::TaggedLogging V4 and above
-    def pop_tags(quantity)
-      if tags = self.tags
-        Thread.current[:semantic_logger_tags] = tags.pop(quantity)
-      end
+    def pop_tags(quantity=1)
+      tags.pop(quantity)
     end
 
     # Thread specific context information to be logged with every log entry

data/lib/semantic_logger/logger.rb

@@ -5,8 +5,16 @@ require 'thread_safe'
 module SemanticLogger
   class Logger < Base
 
-    # Add unused formatter to support Rails 4 logging
+    # DO NOT USE. Adding unused formatter to support Rails 4 logging
     # Formatters must be set at the appender level, not at the logger level
+    #
+    # Due to the following code in Rails::Server#start that cannot be changed
+    # without patching the entire method
+    #    console = ActiveSupport::Logger.new($stdout)
+    #    console.formatter = Rails.logger.formatter
+    #    console.level = Rails.logger.level
+    #
+    #    Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
     attr_accessor :formatter
 
     # Returns a Logger instance

data/lib/semantic_logger/version.rb

@@ -1,3 +1,3 @@
 module SemanticLogger #:nodoc
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

data/test/logger_test.rb

@@ -21,6 +21,7 @@ class LoggerTest < Test::Unit::TestCase
       @logger            = SemanticLogger::Logger.new(self.class, :trace)
       @hash              = { :session_id => 'HSSKLEU@JDK767', :tracking_number => 12345 }
       @hash_str          = @hash.inspect.sub("{", "\\{").sub("}", "\\}")
+      assert_equal [], @logger.tags
     end
 
     teardown do
@@ -53,6 +54,9 @@ class LoggerTest < Test::Unit::TestCase
             SemanticLogger.flush
             assert_match /\d+-\d+-\d+ \d+:\d+:\d+.\d+ \w \[\d+:.+\] \[First Level\] \[tags\] \[Second Level\] LoggerTest -- Hello world/, @mock_logger.message
           end
+          assert_equal 2, @logger.tags.count, @logger.tags
+          assert_equal 'First Level', @logger.tags.first
+          assert_equal 'tags', @logger.tags.last
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_logger
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sync_attr
@@ -46,12 +46,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- Gemfile
-- Gemfile.lock
-- LICENSE.txt
-- README.md
-- Rakefile
-- lib/semantic_logger.rb
 - lib/semantic_logger/appender/base.rb
 - lib/semantic_logger/appender/file.rb
 - lib/semantic_logger/appender/mongodb.rb
@@ -61,7 +55,10 @@ files:
 - lib/semantic_logger/logger.rb
 - lib/semantic_logger/semantic_logger.rb
 - lib/semantic_logger/version.rb
-- others.txt
+- lib/semantic_logger.rb
+- LICENSE.txt
+- Rakefile
+- README.md
 - test/appender_file_test.rb
 - test/appender_mongodb_test.rb
 - test/appender_wrapper_test.rb
@@ -92,4 +89,10 @@ rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Improved logging for Ruby
-test_files: []
+test_files:
+- test/appender_file_test.rb
+- test/appender_mongodb_test.rb
+- test/appender_wrapper_test.rb
+- test/loggable_test.rb
+- test/logger_test.rb
+- test/mock_logger.rb

data/Gemfile

@@ -1,10 +0,0 @@
-source 'http://rubygems.org'
-
-group :test do
-  gem "shoulda"
-  gem "mongo"
-  gem "bson_ext", :platform => 'ruby'
-end
-
-gem "sync_attr"
-gem "thread_safe"

data/Gemfile.lock

@@ -1,39 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    atomic (1.1.8)
-    bourne (1.4.0)
-      mocha (~> 0.13.2)
-    bson (1.8.5)
-    bson_ext (1.8.5)
-      bson (~> 1.8.5)
-    i18n (0.6.1)
-    metaclass (0.0.1)
-    mocha (0.13.3)
-      metaclass (~> 0.0.1)
-    mongo (1.8.5)
-      bson (~> 1.8.5)
-    multi_json (1.7.2)
-    shoulda (3.4.0)
-      shoulda-context (~> 1.0, >= 1.0.1)
-      shoulda-matchers (~> 1.0, >= 1.4.1)
-    shoulda-context (1.1.1)
-    shoulda-matchers (1.5.6)
-      activesupport (>= 3.0.0)
-      bourne (~> 1.3)
-    sync_attr (1.0.0)
-    thread_safe (0.1.0)
-      atomic
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bson_ext
-  mongo
-  shoulda
-  sync_attr
-  thread_safe

data/others.txt

@@ -1,5 +0,0 @@
-logback
-logging
-log4r
-central_logger
-whoops