0
@@ -57,7 +57,7 @@
0
   }
0
   s.requirements << project[:requirements]
0
   s.required_ruby_version = project[:ruby_version_required]
0
-  s.files = (project[:rdoc_files] + %w[Rakefile README LICENSE AUTHORS] + Dir["{spec,lib,example,support,clients}/**/*"]).uniq
0
+  s.files = (project[:rdoc_files] + %w[Rakefile README LICENSE AUTHORS] + Dir["{spec,lib,example,support}/**/*"]).uniq
0
 end
0
 
0
 Rake::GemPackageTask.new(spec) do |p|

0
@@ -1,4 +1,5 @@
0
 require 'log4r'
0
+include Log4r
0
 module Halcyon
0
   module Logging
0
     class Log4r < Log4r::Logger
0
0
@@ -6,9 +7,14 @@
0
       class << self
0
         
0
         def setup(config)
0
-          raise NotImplementedError
0
           logger = self.new(config[:label] || Halcyon.app)
0
-          logger.outputters = Log4r::Outputter.stdout # TODO: Expand this
0
+          if config[:file]
0
+            logger.outputters = Log4r::FileOutputter.new(:filename => config[:file])
0
+          else
0
+            logger.outputters = Log4r::Outputter.stdout
0
+          end
0
+          logger.level = Object.const_get((config[:level] || 'debug').upcase.to_sym)
0
+          logger.outputters[0].formatter = Log4r::PatternFormatter.new(:pattern => "%5l [%d] (#{$$}) #{Halcyon.app} :: %m\n", :date_pattern => "%Y-%m-%d %H:%M:%S")
0
           logger
0
         end
0
         

0
@@ -1,16 +1,14 @@
0
 require 'logging'
0
 module Halcyon
0
   module Logging
0
-    class Logging < Log4r::Logger
0
+    class Logging < Logging::Logger
0
       
0
       class << self
0
         
0
         def setup(config)
0
-          raise NotImplementedError
0
-          # TODO: Needs to be expanded to set up the correct params; these will cause errors
0
-          logger = config[:logger] || self.logger(config[:file] || STDOUT)
0
-          logger.formatter = proc{|s,t,p,m|"%5s [%s] (%s) %s :: %s\n" % [s, t.strftime("%Y-%m-%d %H:%M:%S"), $$, p, m]}
0
+          logger = config[:logger] || ::Logging.logger(config[:file] || STDOUT)
0
           logger.level = config[:level].downcase.to_sym
0
+          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"))
0
           logger
0
         end
0