log4r 1.1.8 → 1.1.9

data/README

@@ -1,8 +1,8 @@
 Log4r - A flexible logging library for Ruby
 
 
-This release:      1.1.8 - ALPHA
-Release date:      XX/Jun/2010
+This release:      1.1.9
+Release date:      28/Oct/2010
 License:           LGPLv3
 Maintainer:        Colby Gutierrez-Kraybill
 Contributors:      Leon Torres               Original Maintainer

data/Rakefile

@@ -10,7 +10,7 @@ require 'date'
 require 'fileutils'
 
 GEM = "log4r"
-GEM_VERSION = "1.1.8"
+GEM_VERSION = "1.1.9"
 AUTHOR = "Colby Gutierrez-Kraybill"
 EMAIL = "colby@astro.berkeley.edu"
 HOMEPAGE = %q{http://log4r.rubyforge.org}

data/examples/fileroll.rb

@@ -10,7 +10,7 @@ puts "this will take a while"
 config = {
   "filename" => "logs/TestTime.log",
   "maxtime" => 10,
-  "trunc" => false
+  "trunc" => true
 }
 timeLog = Logger.new 'WbExplorer'
 timeLog.outputters = RollingFileOutputter.new("WbExplorer", config)

data/lib/log4r.rb

@@ -16,5 +16,5 @@ require "log4r/NDC"
 require "log4r/MDC"
 
 module Log4r
-  Log4rVersion = [1, 1, 8].join '.'
+  Log4rVersion = [1, 1, 9].join '.'
 end

data/lib/log4r/formatter/log4jxmlformatter.rb

@@ -1,4 +1,4 @@
-# :include: ../rdoc/log4jxmlformatter
+# INCLUDE TODO ../rdoc/log4jxmlformatter
 #
 # == Other Info
 #

data/lib/log4r/formatter/patternformatter.rb

@@ -52,6 +52,7 @@ module Log4r
     # * $4 is the .# match which we don't use (it's there to match properly)
     # * $5 is the directive letter
     # * $6 is the stuff after the directive or "" if not applicable
+    # * $7 is the remainder
   
     DirectiveRegexp = /([^%]*)((%-?\d*(\.\d+)?)([cCdgtTmhpMlxX%]))?(\{.+?\})?(.*)/
   
@@ -117,9 +118,19 @@ module Log4r
         # deal with the directive by inserting a %#.#s where %#.# is copied
         # directy from the match
         ebuff << match[3] + "s"
+
 	if ( match[5] == 'X' && match[6] != nil ) then
+
+	  # MDC matches, need to be able to handle String, Symbol or Number
+	  match6sub = /[\{\}\"]/
+	  mdcmatches = match[6].match /\{(:?)(\d*)(.*)\}/
+
+	  if ( mdcmatches[1] == "" && mdcmatches[2] == "" )
+	    match6sub = /[\{\}]/ # don't remove surrounding "'s if String
+	  end
+	  
 	  args <<
-	  DirectiveTable[match[5]].gsub("DTR_REPLACE", match[6]).gsub(/[\{\}]/,'')
+	    DirectiveTable[match[5]].gsub("DTR_REPLACE", match[6]).gsub(match6sub,'')
 	else
 	  args << DirectiveTable[match[5]]  # cull the data for our argument list
 	end

data/lib/log4r/repository.rb

@@ -11,6 +11,7 @@
 # real	2m35.859s user	2m33.951s sys	0m1.224s
 #
 
+require 'monitor'
 require "singleton"
 
 module Log4r
@@ -23,6 +24,7 @@ module Log4r
     # let me know.
 
     class Repository # :nodoc:
+      extend MonitorMixin
       include Singleton
       attr_reader :loggers
 
@@ -31,13 +33,13 @@ module Log4r
       end
 
       def self.[](fullname)
-	Thread.exclusive do
+	self.synchronize do
 	  instance.loggers[fullname]
 	end # exclusive
       end
 
       def self.[]=(fullname, logger)
-	Thread.exclusive do
+	self.synchronize do
 	  instance.loggers[fullname] = logger
 	end # exclusive
       end
@@ -46,7 +48,7 @@ module Log4r
       def self.all_children(parent)
 	# children have the parent name + delimiter in their fullname
 	daddy = parent.name + Private::Config::LoggerPathDelimiter
-	Thread.exclusive do
+	self.synchronize do
 	  for fullname, logger in instance.loggers
 	    yield logger if parent.is_root? || fullname =~ /#{daddy}/
 	  end
@@ -57,7 +59,7 @@ module Log4r
       # an existing inheritance tree. this method
       # updates the children of a logger to link their new parent
       def self.reassign_any_children(parent)
-	Thread.exclusive do
+	self.synchronize do
 	  for fullname, logger in instance.loggers
 	    next if logger.is_root?
 	    logger.parent = parent if logger.path =~ /^#{parent.fullname}$/
@@ -70,7 +72,7 @@ module Log4r
       def self.find_ancestor(path)
 	arr = path.split Log4rConfig::LoggerPathDelimiter
 	logger = nil
-	Thread.exclusive do
+	self.synchronize do
 	  while arr.size > 0 do
 	    logger = Repository[arr.join(Log4rConfig::LoggerPathDelimiter)]
 	    break unless logger.nil?

data/tests/testMDC.rb

@@ -18,4 +18,25 @@ class TestMDC < Test::Unit::TestCase
     assert(Log4r::MDC.get("user") == "colbygk",
 	   "Did not get back expected value, '#{MDC.get("user")}'")
   end
+
+  def test_MDCoutput
+    Log4r::MDC.put(:user, "symbol")
+    Log4r::MDC.put("string", "string")
+    Log4r::MDC.put(5, "number")
+    l = Logger.new 'test'
+    o = StdoutOutputter.new 'test' 
+    l.add o
+    assert_nothing_raised { 
+      f = PatternFormatter.new :pattern=> "%l user: %X{:user} %X{strng} %X{5}"
+      Outputter['test'].formatter = f
+      l.debug "And this?"
+      l.info "How's this?"
+      l.error "and a really freaking huge line which we hope will be trimmed?"
+      e = ArgumentError.new("something barfed")
+      e.set_backtrace Array.new(5, "trace junk at thisfile.rb 154")
+      l.fatal e
+      l.info [1, 3, 5]
+    }
+
+  end
 end

data/tests/testlogger.rb

@@ -139,16 +139,16 @@ class TestLogger < TestCase
   end
   def test_heiarchial_logging
     a = Logger.new("one")
-    a.add(StdoutOutputter.new('so1'))
+    a.add(StdoutOutputter.new 'so1')
     b = Logger.new("one::two")
-    b.add(StdoutOutputter.new('so2'))
+    b.add(StdoutOutputter.new 'so2')
     c = Logger.new("one::two::three")
-    c.add(StdoutOutputter.new('so3'))
+    c.add(StdoutOutputter.new 'so3')
     d = Logger.new("one::two::three::four")
-    d.add(StdoutOutputter.new('so4'))
+    d.add(StdoutOutputter.new 'so4')
     d.additive = false
     e = Logger.new("one::two::three::four::five")
-    e.add(StdoutOutputter.new('so5'))
+    e.add(StdoutOutputter.new 'so5')
 
     a.fatal "statement from a should show up once"
     b.fatal "statement from b should show up twice"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: log4r
 version: !ruby/object:Gem::Version 
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 1
-  - 8
-  version: 1.1.8
+  - 9
+  version: 1.1.9
 platform: ruby
 authors: 
 - Colby Gutierrez-Kraybill
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -07:00
+date: 2010-10-28 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -57,214 +58,6 @@ files:
 - examples/gmail.yaml
 - examples/log4r_yaml.yaml
 - examples/logclient.rb
-- examples/logs/TestSize000001.log
-- examples/logs/TestSize000002.log
-- examples/logs/TestSize000003.log
-- examples/logs/TestSize000004.log
-- examples/logs/TestSize000005.log
-- examples/logs/TestSize000006.log
-- examples/logs/TestSize000007.log
-- examples/logs/TestSize000008.log
-- examples/logs/TestSize000009.log
-- examples/logs/TestSize000010.log
-- examples/logs/TestSize000011.log
-- examples/logs/TestSize000012.log
-- examples/logs/TestSize000013.log
-- examples/logs/TestSize000014.log
-- examples/logs/TestSize000015.log
-- examples/logs/TestSize000016.log
-- examples/logs/TestSize000017.log
-- examples/logs/TestSize000018.log
-- examples/logs/TestSize000019.log
-- examples/logs/TestSize000020.log
-- examples/logs/TestSize000021.log
-- examples/logs/TestSize000022.log
-- examples/logs/TestSize000023.log
-- examples/logs/TestSize000024.log
-- examples/logs/TestSize000025.log
-- examples/logs/TestSize000026.log
-- examples/logs/TestSize000027.log
-- examples/logs/TestSize000028.log
-- examples/logs/TestSize000029.log
-- examples/logs/TestSize000030.log
-- examples/logs/TestSize000031.log
-- examples/logs/TestSize000032.log
-- examples/logs/TestSize000033.log
-- examples/logs/TestSize000034.log
-- examples/logs/TestSize000035.log
-- examples/logs/TestSize000036.log
-- examples/logs/TestSize000037.log
-- examples/logs/TestSize000038.log
-- examples/logs/TestSize000039.log
-- examples/logs/TestSize000040.log
-- examples/logs/TestSize000041.log
-- examples/logs/TestSize000042.log
-- examples/logs/TestSize000043.log
-- examples/logs/TestSize000044.log
-- examples/logs/TestSize000045.log
-- examples/logs/TestSize000046.log
-- examples/logs/TestSize000047.log
-- examples/logs/TestSize000048.log
-- examples/logs/TestSize000049.log
-- examples/logs/TestSize000050.log
-- examples/logs/TestSize000051.log
-- examples/logs/TestSize000052.log
-- examples/logs/TestSize000053.log
-- examples/logs/TestSize000054.log
-- examples/logs/TestSize000055.log
-- examples/logs/TestSize000056.log
-- examples/logs/TestSize000057.log
-- examples/logs/TestSize000058.log
-- examples/logs/TestSize000059.log
-- examples/logs/TestSize000060.log
-- examples/logs/TestSize000061.log
-- examples/logs/TestSize000062.log
-- examples/logs/TestSize000063.log
-- examples/logs/TestSize000064.log
-- examples/logs/TestSize000065.log
-- examples/logs/TestSize000066.log
-- examples/logs/TestSize000067.log
-- examples/logs/TestSize000068.log
-- examples/logs/TestSize000069.log
-- examples/logs/TestSize000070.log
-- examples/logs/TestSize000071.log
-- examples/logs/TestSize000072.log
-- examples/logs/TestSize000073.log
-- examples/logs/TestSize000074.log
-- examples/logs/TestSize000075.log
-- examples/logs/TestSize000076.log
-- examples/logs/TestSize000077.log
-- examples/logs/TestSize000078.log
-- examples/logs/TestSize000079.log
-- examples/logs/TestSize000080.log
-- examples/logs/TestSize000081.log
-- examples/logs/TestSize000082.log
-- examples/logs/TestSize000083.log
-- examples/logs/TestSize000084.log
-- examples/logs/TestSize000085.log
-- examples/logs/TestSize000086.log
-- examples/logs/TestSize000087.log
-- examples/logs/TestSize000088.log
-- examples/logs/TestSize000089.log
-- examples/logs/TestSize000090.log
-- examples/logs/TestSize000091.log
-- examples/logs/TestSize000092.log
-- examples/logs/TestSize000093.log
-- examples/logs/TestSize000094.log
-- examples/logs/TestSize000095.log
-- examples/logs/TestSize000096.log
-- examples/logs/TestSize000097.log
-- examples/logs/TestSize000098.log
-- examples/logs/TestSize000099.log
-- examples/logs/TestSize000100.log
-- examples/logs/TestSize000101.log
-- examples/logs/TestSize000102.log
-- examples/logs/TestSize000103.log
-- examples/logs/TestSize000104.log
-- examples/logs/TestSize000105.log
-- examples/logs/TestSize000106.log
-- examples/logs/TestSize000107.log
-- examples/logs/TestSize000108.log
-- examples/logs/TestSize000109.log
-- examples/logs/TestSize000110.log
-- examples/logs/TestSize000111.log
-- examples/logs/TestSize000112.log
-- examples/logs/TestSize000113.log
-- examples/logs/TestSize000114.log
-- examples/logs/TestSize000115.log
-- examples/logs/TestSize000116.log
-- examples/logs/TestSize000117.log
-- examples/logs/TestSize000118.log
-- examples/logs/TestSize000119.log
-- examples/logs/TestSize000120.log
-- examples/logs/TestSize000121.log
-- examples/logs/TestSize000122.log
-- examples/logs/TestSize000123.log
-- examples/logs/TestSize000124.log
-- examples/logs/TestSize000125.log
-- examples/logs/TestSize000126.log
-- examples/logs/TestSize000127.log
-- examples/logs/TestSize000128.log
-- examples/logs/TestSize000129.log
-- examples/logs/TestSize000130.log
-- examples/logs/TestSize000131.log
-- examples/logs/TestSize000132.log
-- examples/logs/TestSize000133.log
-- examples/logs/TestSize000134.log
-- examples/logs/TestSize000135.log
-- examples/logs/TestSize000136.log
-- examples/logs/TestSize000137.log
-- examples/logs/TestSize000138.log
-- examples/logs/TestSize000139.log
-- examples/logs/TestSize000140.log
-- examples/logs/TestSize000141.log
-- examples/logs/TestSize000142.log
-- examples/logs/TestSize000143.log
-- examples/logs/TestSize000144.log
-- examples/logs/TestSize000145.log
-- examples/logs/TestSize000146.log
-- examples/logs/TestSize000147.log
-- examples/logs/TestSize000148.log
-- examples/logs/TestSize000149.log
-- examples/logs/TestSize000150.log
-- examples/logs/TestSize000151.log
-- examples/logs/TestSize000152.log
-- examples/logs/TestSize000153.log
-- examples/logs/TestSize000154.log
-- examples/logs/TestSize000155.log
-- examples/logs/TestSize000156.log
-- examples/logs/TestSize000157.log
-- examples/logs/TestSize000158.log
-- examples/logs/TestSize000159.log
-- examples/logs/TestSize000160.log
-- examples/logs/TestSize000161.log
-- examples/logs/TestSize000162.log
-- examples/logs/TestSize000163.log
-- examples/logs/TestSize000164.log
-- examples/logs/TestSize000165.log
-- examples/logs/TestSize000166.log
-- examples/logs/TestSize000167.log
-- examples/logs/TestSize000168.log
-- examples/logs/TestSize000169.log
-- examples/logs/TestSize000170.log
-- examples/logs/TestSize000171.log
-- examples/logs/TestSize000172.log
-- examples/logs/TestSize000173.log
-- examples/logs/TestSize000174.log
-- examples/logs/TestSize000175.log
-- examples/logs/TestSize000176.log
-- examples/logs/TestSize000177.log
-- examples/logs/TestSize000178.log
-- examples/logs/TestSize000179.log
-- examples/logs/TestSize000180.log
-- examples/logs/TestSize000181.log
-- examples/logs/TestSize000182.log
-- examples/logs/TestSize000183.log
-- examples/logs/TestSize000184.log
-- examples/logs/TestSize000185.log
-- examples/logs/TestSize000186.log
-- examples/logs/TestSize000187.log
-- examples/logs/TestTime000001.log
-- examples/logs/TestTime000002.log
-- examples/logs/TestTime000003.log
-- examples/logs/TestTime000004.log
-- examples/logs/TestTime000005.log
-- examples/logs/TestTime000006.log
-- examples/logs/TestTime000007.log
-- examples/logs/TestTime000008.log
-- examples/logs/TestTime000009.log
-- examples/logs/TestTime000010.log
-- examples/logs/TestTime000011.log
-- examples/logs/TestTime000012.log
-- examples/logs/TestTime000013.log
-- examples/logs/TestTime000014.log
-- examples/logs/TestTime000015.log
-- examples/logs/TestTime000016.log
-- examples/logs/TestTime000017.log
-- examples/logs/TestTime000018.log
-- examples/logs/TestTime000019.log
-- examples/logs/TestTime000020.log
-- examples/logs/TestTime000021.log
 - examples/logserver.rb
 - examples/moderate.xml
 - examples/moderateconfig.rb
@@ -323,9 +116,6 @@ files:
 - lib/log4r/staticlogger.rb
 - lib/log4r/yamlconfigurator.rb
 - lib/log4r.rb
-- tests/junk/test
-- tests/junk/tmp
-- tests/junk/tmpx.log
 - tests/README
 - tests/testall.rb
 - tests/testbase.rb
@@ -351,23 +141,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: log4r
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Log4r, logging framework for ruby