madvertise-logging 1.0.3 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f0a4b6f1185e8275db0a07a0db9ad6f86446de3b
+  data.tar.gz: 11b02172846a65b4ae5000e41b2bff4c2753ceb3
+SHA512:
+  metadata.gz: b2e1ded1b1116391ed7b265767f7ca91533b266743611fa043227eeacdec6808d80d1491d9422d4626bafa24aa23b73e6980d0cf4b65a20f8abe6c85670d0548
+  data.tar.gz: c87d53db19b474c4db8168de0e8f166e7d17e7c1e70fca07da35ff8b3c220528fe23ef8fa2f286b031c961fa9c83ff92e8f4662935484216925a56c5499694a1

data/Rakefile

@@ -1,8 +1,3 @@
-#!/usr/bin/env rake
-
-require "bundler/setup"
 require "bundler/gem_tasks"
 
 Dir['tasks/**/*.rake'].each { |t| load t }
-
-task :default => [:spec]

data/lib/madvertise/logging/improved_logger.rb

@@ -114,6 +114,7 @@ module Madvertise
       # @param [Symbol, Fixnum] level  New level as Symbol or Fixnum from Logger class.
       # @return [Fixnum] New level converted to Fixnum from Logger class.
       def level=(level)
+        @console.setThreshold(org.apache.log4j.Level.const_get(level.to_s.upcase.to_sym)) if @console
         logger.level = level.is_a?(Symbol) ? self.class.severities[level] : level
         define_level_methods
       end
@@ -123,7 +124,7 @@ module Madvertise
         # We do this dynamically here, so we can implement a no-op for levels
         # which are disabled.
         self.class.severities.each do |severity, num|
-          if num >= logger.level
+          if num >= level
             instance_eval(<<-EOM, __FILE__, __LINE__)
               def #{severity}(*args, &block)
                 if block_given?
@@ -177,7 +178,7 @@ module Madvertise
       end
 
       def add(severity, message, attribs = {})
-        severity = severity.is_a?(Symbol) ? self.class.severities[severity] : severity
+        severity = severity.is_a?(Symbol) ? severity : self.class.severities.key(severity)
 
         attribs.merge!(called_from) if @log_caller
         attribs.merge!(token: @token) if @token
@@ -186,7 +187,7 @@ module Madvertise
         end.join(' ')
 
         message = "#{message} #{attribs}" if attribs.length > 0
-        logger.add(severity) { message }
+        logger.send(severity) { message }
 
         return nil
       end
@@ -247,6 +248,10 @@ module Madvertise
         self.close
 
         case @backend
+        when :log4j
+          create_log4j_backend
+        when :ruby
+          create_ruby_logger(STDOUT)
         when :stdout
           create_io_backend(STDOUT)
         when :stderr
@@ -310,7 +315,40 @@ module Madvertise
       end
 
       def create_logger
-        Logger.new(@logfile).tap do |logger|
+        case RUBY_PLATFORM
+        when 'java'
+          create_log4j_logger
+        else
+          create_ruby_logger(@logfile)
+        end
+      end
+
+      def create_log4j_logger
+        begin
+          require 'log4jruby'
+          Log4jruby::Logger.get($0, :tracing => true, :level => :debug).tap do |logger|
+            configure_log4j(logger)
+          end
+        rescue LoadError
+          self.logger = :ruby
+          error("Couldn't load log4jruby gem, falling back to pure ruby Logger")
+        end
+      end
+
+      def configure_log4j(logger)
+        @console = org.apache.log4j.ConsoleAppender.new
+        @console.setLayout(org.apache.log4j.PatternLayout.new(Formatter.log4j_format))
+        @console.setThreshold(org.apache.log4j.Level::DEBUG)
+        @console.activateOptions
+
+        org.apache.log4j.Logger.getRootLogger.tap do |root|
+          root.getLoggerRepository.resetConfiguration
+          root.addAppender(@console)
+        end
+      end
+
+      def create_ruby_logger(io)
+        Logger.new(io).tap do |logger|
           logger.formatter = Formatter.new
           logger.progname = progname
         end
@@ -325,11 +363,13 @@ module Madvertise
       class Formatter
 
         @format = "%{time} %{progname}(%{pid}) [%{severity}] %{msg}\n"
+        @log4j_format = "%d %c(%t) [%p] %m%n"
         @time_format = "%Y-%m-%d %H:%M:%S.%N"
 
         class << self
           # Format string for log messages.
           attr_accessor :format
+          attr_accessor :log4j_format
 
           # Format string for timestamps in log messages.
           attr_accessor :time_format

data/madvertise-logging.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "madvertise-logging"
-  spec.version       = "1.0.3"
+  spec.version       = "1.1.0"
   spec.authors       = ["madvertise Mobile Advertising GmbH"]
   spec.email         = ["tech@madvertise.com"]
   spec.description   = %q{Advanced logging classes with buffer backend, transactions, multi logger, etc}

data/tasks/rspec.rake

@@ -4,6 +4,7 @@ begin
 
   desc "Run the specs"
   RSpec::Core::RakeTask.new do |t|
+    t.verbose = false
     t.rspec_opts = ['--options', "spec/spec.opts"]
   end
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: madvertise-logging
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease:
+  version: 1.1.0
 platform: ruby
 authors:
 - madvertise Mobile Advertising GmbH
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies: []
-description: Advanced logging classes with buffer backend, transactions, multi logger, etc
+description: Advanced logging classes with buffer backend, transactions, multi logger,
+  etc
 email:
 - tech@madvertise.com
 executables: []
@@ -43,7 +43,8 @@ files:
 - tasks/yard.rake
 homepage: https://github.com/madvertise/logging
 licenses: []
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -51,29 +52,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: '0'
-      hash: 2
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
       version: '0'
-      hash: 2
-  none: false
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
-specification_version: 3
-summary: Advanced logging classes with buffer backend, transactions, multi logger, etc
+rubyforge_project: 
+rubygems_version: 2.0.3
+signing_key: 
+specification_version: 4
+summary: Advanced logging classes with buffer backend, transactions, multi logger,
+  etc
 test_files:
 - spec/improved_logger_spec.rb
 - spec/multi_logger_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc:
+has_rdoc: