lumber 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a46d745783b60fff11ef0721004f12f9f63bd96
-  data.tar.gz: 3eba30bf67000eb632ed7a43b874b9311c06ea7d
+  metadata.gz: e6695093aa77737d03320b495d979a1cbb8bd88f
+  data.tar.gz: 22f4e7ea92bb1582ddbfae50c2e308250e59eb20
 SHA512:
-  metadata.gz: 90f2ac82d2c07a1c41de9f1135bf635826829bb26f055d65c0d71935276eb407a5f07f23e27a2bdcb41075f655492ce566392f8606cac0c440df7fac4f8874bc
-  data.tar.gz: e982a2aa70f9201f721cbd05fb9a32a7a6cdf651e9a2afb3ad324a9e3ae1bf4035c734049a4c4b52be67ef4b9c0480c61b5cb8cd2f96bc1c7955a1664376eef4
+  metadata.gz: 45c8f777f62c0bf92c1eb8758815e0bf99b5e1d50d71e0fda8f431a36fc5e846085e56c90acc2832a43fceddc2ca409dc3d7fe0d2b9926e2e56b6e40e2b0e139
+  data.tar.gz: 91fe68609b03ae3a48f2cfe4b9269361fef12bb7f20a64d5cf9aee37092de66458c14b69d89e17811d0324dc481d916fbdb07662fd683a572f9eedba5c644b2b

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.0.2 (10/11/2013)
+------------------
+
+add ability to add constant fields to json output <b99703a> [Matt Conway]
+
 1.0.1 (10/11/2013)
 ------------------
 

data/lib/lumber/json_formatter.rb

@@ -6,13 +6,23 @@ module Lumber
   class JsonFormatter < Log4r::BasicFormatter
 
     def initialize(hash={})
-      @key_mapping = {}
       mapping = hash['key_mapping'] || {}
       @key_mapping = Hash[mapping.collect {|k, v| [k.to_s, v.to_s.split('.')]}]
+
+      @fields = {}
+      fields = hash['fields'] || {}
+      fields.each do |k, v|
+        if v.kind_of? String
+          @fields[k.to_s] = v.to_s.gsub(/#\{(.+)\}/) {|m| eval($1) }
+        else
+          @fields[k.to_s] = v
+        end
+      end
     end
 
     def format(logevent)
-      data = {}
+      data = @fields.dup
+
       assign_mapped_key(data, :timestamp, Time.now.to_s)
       assign_mapped_key(data, :logger, logevent.fullname)
       assign_mapped_key(data, :level, Log4r::LNAMES[logevent.level].downcase)

data/lib/lumber/version.rb

@@ -1,3 +1,3 @@
 module Lumber
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/json_formatter_spec.rb

@@ -27,7 +27,7 @@ describe Lumber::JsonFormatter do
       outputter.formatter.should be_a_kind_of Lumber::JsonFormatter
     end
 
-    it "can receive configuration" do
+    it "can receive key_mapping configuration" do
       yml = <<-EOF
         log4r_config:
           pre_config:
@@ -54,6 +54,34 @@ describe Lumber::JsonFormatter do
       outputter.formatter.instance_variable_get(:@key_mapping).should eq({'level' => ['severity'], 'backtrace' => ['exception', 'bt']})
     end
 
+    it "can receive fields configuration" do
+      yml = <<-'EOF'
+        log4r_config:
+          pre_config:
+            root:
+              level: 'DEBUG'
+          loggers:
+            - name: "mylogger"
+
+          outputters:
+            - type: StdoutOutputter
+              name: stdout
+              formatter:
+                type: JsonFormatter
+                fields:
+                  version: 1
+                  dynamic: "#{1+1}"
+      EOF
+      yml.should include('#{1+1}')
+      cfg = Log4r::YamlConfigurator
+      cfg['hostname'] = 'foo'
+      cfg.load_yaml_string(yml)
+      outputter = Log4r::Outputter['stdout']
+      outputter.formatter.should_not be_nil
+      outputter.formatter.should be_a_kind_of Lumber::JsonFormatter
+      outputter.formatter.instance_variable_get(:@fields).should eq({'version' => 1, 'dynamic' => '2'})
+    end
+
   end
   
   context "#assign_mapped_key" do
@@ -129,6 +157,16 @@ describe Lumber::JsonFormatter do
       json['severity'].should == 'info'
     end
 
+    it "logs as json with fields" do
+      @formatter = Lumber::JsonFormatter.new('fields' => {'version' => 1})
+      @outputter.formatter = @formatter
+
+      @logger.info("howdy")
+      json = JSON.parse(@sio.string)
+      json['message'].should == 'howdy'
+      json['version'].should == 1
+    end
+
     it "logs exception as json" do
       ex = StandardError.new("mybad")
       raise ex rescue nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lumber
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Matt Conway