log4jruby 2.0.0.rc1-java → 2.0.0.rc2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7f89b3af3a89c4ca208a322188f30046f5e402e
-  data.tar.gz: 3dcd279c0ce788d02898707987eb4b14ec1a9826
+  metadata.gz: 697befc3d72d9240809724c8dcfc6024c0b0bf07
+  data.tar.gz: 3ed0bdba649f88a4d1c85ba3ce79a4c86349cb78
 SHA512:
-  metadata.gz: f54a8f287e040444e357a2953b78af7ef75c2bba3fed5ab7745eb5c27cc3be297126d79227d35c00a7912bf88028cce0581645c9a776aaea7b12e0e625effbf8
-  data.tar.gz: e183b855910b6dd860959c8abeb2a6ee743e038c9706876e94a5dace9a029f10f0371a968411763c81eda6e83b5419e07ad83abcbef42823b83ebda156704454
+  metadata.gz: 48084bb0a2d70263062a48bc611f84f8e906361411227eddd2172c015631bca6178c79f88771b0fc5d4441b0d55e713a4db1803412de1e393bd135b0f270474f
+  data.tar.gz: 79a4041e5123dc4a1dc189c438c150e12ea7f435104f6749c1e041a1f7c11f995bc18d905c065c1340507065e7d68d4d65830ce3842dfceeca7b3974138600d8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # log4jruby Changelog
 
+## v2.0.0.rc2
+
+* Internal implementation changes - https://github.com/lenny/log4jruby/pull/8
+
 ## v2.0.0.rc1
 
 * ```Log4jruby::Rails``` has been removed - Rails apps seem better off configuring

data/lib/log4jruby.rb

@@ -1,16 +1,16 @@
-require 'log4jruby/logger'
-require 'log4jruby/logger_for_class'
-
 module Log4jruby
   module Support
-
   end
 end
 
+require 'log4jruby/support/bootstrap'
+require 'log4jruby/logger'
+require 'log4jruby/logger_for_class'
+
 Object.class_eval do
   class << self
     def enable_logger
       send(:include, Log4jruby::LoggerForClass)
     end
   end
-end
+end

data/lib/log4jruby/logger.rb

@@ -31,7 +31,7 @@ module Log4jruby
       def[](name)
         name = name.nil? ? 'jruby' : "jruby.#{name.gsub('::', '.')}"
         log4j = Java::org.apache.log4j.Logger.getLogger(name)
-        fetch_logger(log4j, new(log4j))
+        fetch_logger(log4j)
       end
 
       # same as [] but accepts attributes
@@ -44,21 +44,19 @@ module Log4jruby
       # Return root Logger(i.e. jruby)
       def root
         log4j = Java::org.apache.log4j.Logger.getLogger('jruby')
-        fetch_logger(log4j, new(log4j))
+        fetch_logger(log4j)
       end
 
       def reset # :nodoc:
-        init_store
+        Java::org.apache.log4j.LogManager.getCurrentLoggers.each do |l|
+          l.ruby_logger = nil
+        end
       end
 
       private
 
-      def fetch_logger(log4j_logger, default)
-        @logger_mapping.putIfAbsent(log4j_logger.getName, default) || @logger_mapping.get(log4j_logger.getName)
-      end
-
-      def init_store
-        @logger_mapping = Java::java.util.concurrent.ConcurrentHashMap.new
+      def fetch_logger(log4j_logger)
+        Java::org.apache.log4j.Logger.getLogger(log4j_logger.getName).ruby_logger
       end
     end
 
@@ -171,7 +169,7 @@ module Log4jruby
     end
 
     def parent
-      fetch_logger(log4j_logger.parent, Logger.root)
+      fetch_logger(log4j_logger.parent)
     end
 
     private
@@ -218,10 +216,9 @@ module Log4jruby
       Java::org.apache.log4j.MDC
     end
 
-    def fetch_logger(log4j_logger, default)
-      self.class.send(:fetch_logger, log4j_logger, default)
+    def fetch_logger(log4j_logger)
+      self.class.send(:fetch_logger, log4j_logger)
     end
   end
 end
 
-Log4jruby::Logger.send(:init_store) #Avoid lazy-initialization thread-safety issues on logger_mapping

data/lib/log4jruby/support/bootstrap.rb

@@ -0,0 +1,18 @@
+require 'thread'
+
+Java::org.apache.log4j.Logger.class_eval do
+  attr_accessor :ruby_logger
+  @ruby_logger_lock = Mutex.new
+
+  class << self
+    def ruby_logger_lock
+      @ruby_logger_lock
+    end
+  end
+
+  def ruby_logger
+    self.class.ruby_logger_lock.synchronize do
+      @ruby_logger ||= Log4jruby::Logger.new(self)
+    end
+  end
+end

data/lib/log4jruby/version.rb

@@ -1,3 +1,3 @@
 module Log4jruby
-  VERSION = '2.0.0.rc1'
+  VERSION = '2.0.0.rc2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log4jruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: java
 authors:
 - Lenny Marks
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-06 00:00:00.000000000 Z
 dependencies: []
 description: Ruby Logger using Log4j, geared toward those who use JRuby to write Ruby code using/extending Java code. Ruby and Java are configured together using traditional Log4j methods.
 email:
@@ -22,6 +22,7 @@ files:
 - lib/log4jruby.rb
 - lib/log4jruby/logger.rb
 - lib/log4jruby/logger_for_class.rb
+- lib/log4jruby/support/bootstrap.rb
 - lib/log4jruby/support/log4j_args.rb
 - lib/log4jruby/version.rb
 homepage: https://github.com/lenny/log4jruby