@@ -57,7 +57,7 @@ spec = Gem::Specification.new do |s| } s.requirements << project[:requirements] s.required_ruby_version = project[:ruby_version_required] - s.files = (project[:rdoc_files] + %w[Rakefile README LICENSE AUTHORS] + Dir["{spec,lib,example,support,clients}/**/*"]).uniq + s.files = (project[:rdoc_files] + %w[Rakefile README LICENSE AUTHORS] + Dir["{spec,lib,example,support}/**/*"]).uniq end Rake::GemPackageTask.new(spec) do |p| Rakefile @@ -1,4 +1,5 @@ require 'log4r' +include Log4r module Halcyon module Logging class Log4r < Log4r::Logger @@ -6,9 +7,14 @@ module Halcyon class << self def setup(config) - raise NotImplementedError logger = self.new(config[:label] || Halcyon.app) - logger.outputters = Log4r::Outputter.stdout # TODO: Expand this + if config[:file] + logger.outputters = Log4r::FileOutputter.new(:filename => config[:file]) + else + logger.outputters = Log4r::Outputter.stdout + end + logger.level = Object.const_get((config[:level] || 'debug').upcase.to_sym) + logger.outputters[0].formatter = Log4r::PatternFormatter.new(:pattern => "%5l [%d] (#{$$}) #{Halcyon.app} :: %m\n", :date_pattern => "%Y-%m-%d %H:%M:%S") logger end lib/halcyon/logging/log4r.rb @@ -1,16 +1,14 @@ require 'logging' module Halcyon module Logging - class Logging < Log4r::Logger + class Logging < Logging::Logger class << self def setup(config) - raise NotImplementedError - # TODO: Needs to be expanded to set up the correct params; these will cause errors - logger = config[:logger] || self.logger(config[:file] || STDOUT) - logger.formatter = proc{|s,t,p,m|"%5s [%s] (%s) %s :: %s\n" % [s, t.strftime("%Y-%m-%d %H:%M:%S"), $$, p, m]} + logger = config[:logger] || ::Logging.logger(config[:file] || STDOUT) logger.level = config[:level].downcase.to_sym + logger.instance_variable_get("@appenders")[0].instance_variable_set("@layout", ::Logging::Layouts::Pattern.new(:pattern => "%5l [%d] (%p) #{Halcyon.app} :: %m\n", :date_pattern => "%Y-%m-%d %H:%M:%S")) logger end lib/halcyon/logging/logging.rb 3b89d6794cdc1256081b079afc364254b4487fd2 Matt Todd chiology@gmail.com http://github.com/mtodd/halcyon/commit/1ac4e4b19dc3be4b25fcf79df14b1721f5aca72c 1ac4e4b19dc3be4b25fcf79df14b1721f5aca72c 2008-04-04T15:05:26-07:00 2008-04-04T15:05:26-07:00 Finished implementing the Log4r and Logging loggers. 4b215300b258beb03170c64e80a8a27bbd39ef34 Matt Todd chiology@gmail.com