test/benchmark.rb in logging-0.4.0 vs test/benchmark.rb in logging-0.5.0

@@ -1,16 +1,19 @@
-# $Id: benchmark.rb 34 2007-02-28 21:42:41Z tim_pease $
+# $Id: benchmark.rb 46 2007-10-31 14:39:01Z tim_pease $
 
 begin
   require 'logging'
 rescue LoadError
-  require 'rubygems'
-  require 'logging'
+  path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
+  raise if $:.include? path
+  $: << path
+  retry
 end
 
 begin
   require 'rubygems'
+  gem 'log4r'
   require 'log4r'
   $log4r = true
 rescue LoadError
   $log4r = false
 end
@@ -34,10 +37,16 @@
       logger.level = ::Logger::WARN
 
       log4r = if $log4r
         x = ::Log4r::Logger.new('benchmark')
         x.level = ::Log4r::WARN
-        x.add ::Log4r::IOOutputter.new('benchmark', sio)
+        x.add ::Log4r::IOOutputter.new(
+          'benchmark', sio,
+          :formatter => ::Log4r::PatternFormatter.new(
+            :pattern => "%.1l, [%d #\#{Process.pid}] %5l : %M\n",
+            :date_pattern => "%Y-%m-%dT%H:%M:%S.\#{Time.now.usec}"
+          )
+        )
         x
       end
 
       puts "== Debug (not logged) ==\n"
       ::Benchmark.bm(10) do |bm|