logging.rb in zk-1.5.0

- old
+ new
@@ -1,15 +1,37 @@
 module ZK
+  # use the ZK.logger if non-nil (to allow users to override the logger)
+  # otherwise, use a Loggging logger based on the class name
   module Logging
-    def self.included(mod)
-      mod.extend(ZK::Logging::Methods)
-      mod.send(:include, ZK::Logging::Methods)
+    extend ZK::Concern
+
+    included do
+      def self.logger
+        ::ZK.logger || ::Logging.logger[logger_name]
+      end
     end
-    
-    module Methods
-      def logger
-        ZK.logger
+
+    def self.set_default
+      ::Logging.logger['ZK'].tap do |ch_root|
+        ::Logging.appenders.stderr.tap do |serr|
+          serr.layout = ::Logging.layouts.pattern(
+            :pattern => '%.1l, [%d] %c30.30{2}:  %m\n',
+            :date_pattern => '%Y-%m-%d %H:%M:%S.%6N' 
+          )
+
+          ch_root.add_appenders(serr)
+        end
+
+        ch_root.level = ENV['ZK_DEBUG'] ? :debug : :off
       end
+    end
+
+    # cache the logger at the instance level, as that's where most of the
+    # logging is done, this means that the user should set up the override
+    # of the ZK.logger early, before creating instances.
+    #
+    def logger
+      @logger ||= (::ZK.logger || ::Logging.logger[self.class.logger_name]) # logger_name defined in ::Logging::Utils
     end
   end
 end
 