tee_logger.rb in tee_logger-3.1.1

- old
+ new
@@ -1,154 +1,46 @@
 require 'tee_logger/version'
 require 'tee_logger/constants'
 require 'tee_logger/utils'
+require 'tee_logger/tee_logger_base'
 require 'logger'
 
 # namespace
 module TeeLogger
-  # shortcut for TeeLogger::TeeLogger.new
-  # @see TeeLogger
-  def self.new(logdev = DEFAULT_FILE, shift_age = 0, shift_size = 1_048_576)
-    TeeLogger.new(logdev, shift_age, shift_size)
-  end
-
-  # define singleton method .logger for your module.
-  # and TeeLogger.progname is your module name.
-  def self.extended(mod)
-    mod.class_eval do
-      define_singleton_method(:logger) do |logdev = DEFAULT_FILE|
-        return @logger if @logger
-        @logger = TeeLogger.new(logdev)
-        @logger.progname = self
-        @logger
-      end
-    end
-  end
-
-  # define instance method #logger for your class.
-  # and TeeLogger.progname is your class name.
-  def self.included(klass)
-    klass.class_eval do
-      define_method(:logger) do |logdev = DEFAULT_FILE|
-        return @logger if @logger
-        @logger = TeeLogger.new(logdev)
-        @logger.progname = self.class.name
-        @logger
-      end
-    end
-  end
-
-  # main
-  # @see http://www.rubydoc.info/stdlib/logger/Logger Logger
-  class TeeLogger
-    class << self
-      # @!macro [attach] logging_methods
-      #   @!method $1(progname = nil, *options, &block)
-      #   logging $1 level message.
-      #   @param progname see also Logger
-      #   @param options [Array]
-      #   @option options [Fixnum] indent_level
-      #   @option options [Symbol] enabling_target
-      #                            valid values => [:console, :logfile]
-      #   @param &block see also Logger
-      #   @return true
-      #   @see Logger
-      def define_logging_methods(name)
-        define_method(name) do |progname = nil, *options, &block|
-          logdev_name, indent_level = extract_options(options).values
-          progname, block = indentation(progname, block, indent_level)
-          logging(name, progname, logdev_name, &block)
-        end
-      end
-      private :define_logging_methods
-
-      # @!macro [attach] loglevel_check_methods
-      #   @!method $1(name)
-      #   @return [Boolean]
-      def define_loglevel_check_methods(name)
-        define_method(name) do
-          @console.send(name)
-          @logfile.send(name)
-        end
-      end
-      private :define_loglevel_check_methods
-    end
-
-    include Utils
-    attr_reader :level, :progname, :formatter, :datetime_format
-
+  class << self
+    # shortcut for TeeLogger::TeeLoggerBase.new
     # @param logdev [String]
     # @param shift_age [Integer]
     # @param shift_size [Integer]
-    # @see Logger#initialize
-    def initialize(logdev = DEFAULT_FILE, shift_age = 0, shift_size = 1_048_576)
-      @console = Logger.new($stdout)
-      @logfile = Logger.new(logdev, shift_age, shift_size)
+    # @return [TeeLogger::TeeLoggerBase]
+    # @see TeeLoggerBase
+    def new(logdev = DEFAULT_FILE, shift_age = 0, shift_size = 1_048_576)
+      TeeLoggerBase.new(logdev, shift_age, shift_size)
     end
 
-    define_logging_methods :debug
-    define_logging_methods :info
-    define_logging_methods :warn
-    define_logging_methods :error
-    define_logging_methods :fatal
-
-    define_loglevel_check_methods :debug?
-    define_loglevel_check_methods :info?
-    define_loglevel_check_methods :warn?
-    define_loglevel_check_methods :error?
-    define_loglevel_check_methods :fatal?
-
-    # @param level [Integer]
-    def level=(level)
-      @console.level = @logfile.level = @level = level
-    end
-    alias_method :sev_threshold, :level
-    alias_method :sev_threshold=, :level=
-
-    # @param name [String, Symbol]
-    def progname=(name = nil)
-      @console.progname = @logfile.progname = @progname = name
-    end
-
-    # @param formatter
-    def formatter=(formatter)
-      @console.formatter = @logfile.formatter = @formatter = formatter
-    end
-
-    # @param formatter
-    def datetime_format=(format)
-      @console.datetime_format =
-        @logfile.datetime_format =
-          @datetime_format = format
-    end
-
-    # @param logdev_name [String, Symbol]
-    # @yield before logdev_name disable, after logdev_name enable.
-    def disable(logdev_name)
-      correct_name?(logdev_name)
-      if block_given?
-        disable(logdev_name)
-        yield
-        enable(logdev_name)
-      else
-        logdev_instance(logdev_name).formatter = FORMATTER_FOR_DISABLING
+    # define singleton method .logger for your module.
+    # and TeeLogger.progname is your module name.
+    def extended(mod)
+      mod.class_eval do
+        define_singleton_method(:logger) do |logdev = DEFAULT_FILE|
+          return @logger if @logger
+          @logger = TeeLoggerBase.new(logdev)
+          @logger.progname = self
+          @logger
+        end
       end
     end
 
-    # @param logdev_name [String, Symbol]
-    def enable(logdev_name)
-      correct_name?(logdev_name)
-      logdev_instance(logdev_name).formatter = @formatter
-    end
-
-    private
-
-    def logging(name, progname, logdev_name = nil, &block)
-      if logdev_name
-        disable(logdev_name) { logging(name, progname, &block) }
-      else
-        @console.send(name, progname, &block)
-        @logfile.send(name, progname, &block)
+    # define instance method #logger for your class.
+    # and TeeLogger.progname is your class name.
+    def included(klass)
+      klass.class_eval do
+        define_method(:logger) do |logdev = DEFAULT_FILE|
+          return @logger if @logger
+          @logger = TeeLoggerBase.new(logdev)
+          @logger.progname = self.class.name
+          @logger
+        end
       end
     end
   end
 end