lumber 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6695093aa77737d03320b495d979a1cbb8bd88f
-  data.tar.gz: 22f4e7ea92bb1582ddbfae50c2e308250e59eb20
+  metadata.gz: 46565c6578428e0fd2b235b3c342958c1bdd2ca2
+  data.tar.gz: f6d4b6262295e7e8f7eb9ffac68ae180ae9329c0
 SHA512:
-  metadata.gz: 45c8f777f62c0bf92c1eb8758815e0bf99b5e1d50d71e0fda8f431a36fc5e846085e56c90acc2832a43fceddc2ca409dc3d7fe0d2b9926e2e56b6e40e2b0e139
-  data.tar.gz: 91fe68609b03ae3a48f2cfe4b9269361fef12bb7f20a64d5cf9aee37092de66458c14b69d89e17811d0324dc481d916fbdb07662fd683a572f9eedba5c644b2b
+  metadata.gz: 252efef13b42f54c839d9b9b20908df2e6902a9b657c9452283e9dde81600ce63ebb95f9d9f2878b65eead7e2d6da8279761e00bdfb9a63a7ffba5117dec48f8
+  data.tar.gz: 3110b279693bea1ad2a1b522aff0c9c9ab6c57090e1a1c6b3f44adda84748af326f44a84f994144d9e296c5d05888bd621d8feed5062f5cc8108e11b4d848629

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.0.3 (10/11/2013)
+------------------
+
+add date_pattern and newline at end of formatted message <90daa25> [Matt Conway]
+
 1.0.2 (10/11/2013)
 ------------------
 

data/lib/lumber/json_formatter.rb

@@ -18,12 +18,14 @@ module Lumber
           @fields[k.to_s] = v
         end
       end
+
+      @date_pattern = hash['date_pattern'] || '%H:%M:%S'
     end
 
     def format(logevent)
       data = @fields.dup
 
-      assign_mapped_key(data, :timestamp, Time.now.to_s)
+      assign_mapped_key(data, :timestamp, Time.now.strftime(@date_pattern))
       assign_mapped_key(data, :logger, logevent.fullname)
       assign_mapped_key(data, :level, Log4r::LNAMES[logevent.level].downcase)
 
@@ -82,7 +84,7 @@ module Lumber
         assign_mapped_key(data, :mdc, value)
       end
 
-      data.to_json
+      "#{data.to_json}\n"
     end
 
     private

data/lib/lumber/version.rb

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

data/spec/json_formatter_spec.rb

@@ -74,7 +74,6 @@ describe Lumber::JsonFormatter do
       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
@@ -82,6 +81,30 @@ describe Lumber::JsonFormatter do
       outputter.formatter.instance_variable_get(:@fields).should eq({'version' => 1, 'dynamic' => '2'})
     end
 
+    it "can receive date_pattern configuration" do
+      yml = <<-'EOF'
+        log4r_config:
+          pre_config:
+            root:
+              level: 'DEBUG'
+          loggers:
+            - name: "mylogger"
+
+          outputters:
+            - type: StdoutOutputter
+              name: stdout
+              formatter:
+                type: JsonFormatter
+                date_pattern: "%M"
+      EOF
+      cfg = Log4r::YamlConfigurator
+      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(:@date_pattern).should == "%M"
+    end
+
   end
   
   context "#assign_mapped_key" do
@@ -167,6 +190,17 @@ describe Lumber::JsonFormatter do
       json['version'].should == 1
     end
 
+    it "logs as json with date format" do
+      now = Time.now
+      Time.stub(:now).and_return(now)
+      @formatter = Lumber::JsonFormatter.new('date_pattern' => "%s")
+      @outputter.formatter = @formatter
+
+      @logger.info("howdy")
+      json = JSON.parse(@sio.string)
+      json['timestamp'].should == now.to_i.to_s
+    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.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Matt Conway