lumber 0.13.0 → 0.13.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+0.13.1 (09/19/2012)
+-------------------
+
+add mdc formatter helper <f54713e>
+
 0.13.0 (08/10/2012)
 -------------------
 

data/generators/lumber/templates/log4r.yml

@@ -14,5 +14,7 @@ log4r_config:
       trunc: 'false'
       formatter   :
         date_pattern: '%H:%M:%S'
-        pattern     : '%-5l %d #{hostname} %c[#{Process.pid}]: %m'
+        pattern     : '%-5l %d %C(#{hostname}:#{Process.pid}) [#{Lumber.format_mdc}]: %M'
         type        : PatternFormatter
+
+

data/lib/lumber/lumber.rb

@@ -119,6 +119,13 @@ module Lumber
     end
   end
 
+  # Helper to make it easier to log context through log4r.yml 
+  def format_mdc()
+    ctx = Log4r::MDC.get_context.collect {|k, v| k.to_s + "=" + v.to_s }.join(" ")
+    ctx.gsub!('%', '%%')
+    return ctx
+  end
+  
   private
 
   # Adds a inheritance handler to Object so we can know to add loggers

data/lib/lumber/version.rb

@@ -1,3 +1,3 @@
 module Lumber
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

data/spec/lumber_spec.rb

@@ -154,4 +154,27 @@ describe Lumber do
     assert_valid_logger('Foo3', "root::Foo1::Foo3")
   end
 
+  context "formatted MDC context" do
+    
+    before(:each) do
+      Log4r::MDC.get_context.keys.each {|k| Log4r::MDC.remove(k) }
+    end
+    
+    it "is empty for no context" do
+      Lumber.format_mdc.should == ""
+    end
+    
+    it "has context vars" do
+      Log4r::MDC.put("foo", "bar")
+      Log4r::MDC.put("baz", "boo")
+      Lumber.format_mdc.should == "foo=bar baz=boo"
+    end
+    
+    it "escapes %" do
+      Log4r::MDC.put("%foo", "%bar")
+      Lumber.format_mdc.should == "%%foo=%%bar"
+    end
+    
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lumber
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -235,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2273159776171190626
+      hash: 820786214147561006
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2273159776171190626
+      hash: 820786214147561006
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24