log.rb in sinatra-log-0.1.2

- old
+ new
@@ -1,118 +1,2 @@
 require 'rubygems'
-require 'log4r'
-require 'time'
-
-module Sinatra
-  # Logs to specified filename with the format:
-  #
-  #   [Log Level]: [Timestamp (ISO-8601)]: [File:linenum]: [Log Message]
-  #
-  # Access is usually wrapped in a class helper:
-  #
-  # class MyProject
-  #   self.log
-  #     @logger ||= Sinatra::Log.new(:logger_name => 'myproject',
-  #                                  :log_filename => 'myproject/dev.log',
-  #                                  :loglevel => 'WARN',
-  #                                  :enabled => true,
-  #                                  :project_dir => '/var/opt/myproj')
-  #   end
-  # end
-  class Log
-    include Log4r
-
-    REQUIRED_CONFIG_SYMBOLS = [:logger_name, :loglevel, :log_filename,
-                               :enabled].freeze
-
-    # Formatter that include the filename and relative path, and line number in
-    # output of the caller.
-    #
-    # Since all callers go through the methods defined in this class to log, we
-    # look at the second line of the tracer output, removing everything but the
-    # directories after the project directory.
-    class DefaultFormatter < Log4r::Formatter
-      attr_reader :basedir
-
-      # @param [String] basedir   The base project directory; this directory
-      #   will be filtered out from each log entry if specified.
-      def initialize(basedir = nil)
-        super
-        @basedir = basedir
-      end
-
-      # Return a trimmed version of the filename from where a LogEvent occurred
-      #
-      # @param [String] tracer A line from the LogEvent#tracer Array
-      # @return [String] Trimmed and parsed version of the file ane line number
-      def event_filename(tracer)
-        if basedir.nil?
-          parts = tracer.match(/(.*:[0-9]+).*:/)
-        else
-          parts = tracer.match(/#{basedir}\/(.*:[0-9]+).*:/)
-        end
-
-        # If we get no matches back, we're probably in a jar file in which case
-        # the format of the tracer is going to be abbreviated
-        if parts.nil?
-          parts = tracer.match(/(.*:[0-9]+).*:/)
-        end
-        return parts[-1] if parts
-      end
-
-      # Receive the LogEvent and pull out the log message and format it for
-      # display in the logs
-      #
-      # @param [Log4r::LogEvent] event
-      # @return [String] Formatted log message
-      def format(event)
-        filename = event_filename(event.tracer[1])
-        time = Time.now.utc.iso8601
-        return "#{Log4r::LNAMES[event.level]}: #{time}: #{filename}: #{event.data}\n"
-      end
-    end
-
-    attr_reader :outputter
-
-    def initialize(config={})
-      errors = []
-      REQUIRED_CONFIG_SYMBOLS.each do |key|
-        if !config.include?(key)
-          errors << "#{key} required, but not specified in config hash"
-        end
-      end
-      raise ArgumentError, "#{errors}" if errors.count > 0
-
-      logger_name = config[:logger_name].to_s.gsub(/\s+/, '_')
-      @logger = Log4r::Logger.new(logger_name)
-
-      if config[:enabled]
-        index = Log4r::LNAMES.index(config[:loglevel])
-        # if logger.level is not in LNAMES an exception will be thrown
-        @logger.level = index unless index.nil?
-      else
-        @logger.level = Log4r::OFF
-      end
-
-      @outputter = FileOutputter.new("#{logger_name}fileoutput",
-                                     :filename => config[:log_filename],
-                                     :trunc => false)
-      @logger.trace = true
-      @outputter.formatter = DefaultFormatter.new(config[:project_dir])
-      @logger.outputters = @outputter
-    end
-
-
-    [:debug, :info, :warn, :error, :fatal, :level].each do |method|
-      define_method(method) do |*args, &block|
-        @logger.send(method, *args, &block)
-      end
-
-      # Returns true iff the current severity level allows for
-      # the printing of level messages.
-      allow_logging = "#{method}?".to_sym
-      define_method(allow_logging) do |*args|
-        @logger.send(allow_logging, *args)
-      end
-    end
-  end
-end
+require 'sinatra/log/log'