ougai 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd24ccdad4b3e8fa0a273e6bc4d4a7633b8a2099
-  data.tar.gz: b4ac8f5e868affc6c44e5592651f68ca634ae3ba
+  metadata.gz: 056bac74cd408498f0fb9a5db5f8741094a201ac
+  data.tar.gz: 7aec3907ebf359aa409a528a028605c8d4538281
 SHA512:
-  metadata.gz: bf27f89b20a9bd241fd329b756be6d1d5cd163bae87dd0c7f51dc8e3b95f6c58dc857fb6e4765c16a1162279465fe2d21378af45323f56acf1e8d02f01028799
-  data.tar.gz: def31d8b2f563ab7e12e9fea200796177f417b9e3523ee9890c5edb60a647826e477e9c2db412a06b285921e457ddc81cedf516fe86ea500758e53900411a357
+  metadata.gz: d1fa397a69c767a637919f3891fba6c5e4a3edadb150483ffce4df6f5870c6f95bc28d33592438c1eabc71c4a2c7f23739e3ce2be8236ed733c65633561b2264
+  data.tar.gz: d8a3ff21840a2d0fb328d12d2fd4f643b2512d3e2f55691d4fd0fcab7943b4f22c6e6248dd42aa603e5ff2abf7b0990c068d94a12ff9e7b1d8ccda1ce27f5a8c

data/README.md

@@ -369,6 +369,7 @@ logger outputs
 
 - [Use as Rails logger](https://github.com/tilfin/ougai/wiki/Use-as-Rails-logger)
 - [Customize Sidekiq logger](https://github.com/tilfin/ougai/wiki/Customize-Sidekiq-logger)
+- [Forward logs to Fluentd](https://github.com/tilfin/ougai/wiki/Forward-logs-to-Fluentd)
 
 ## License
 

data/lib/ougai/formatters/bunyan.rb

@@ -4,11 +4,12 @@ require 'json'
 module Ougai
   module Formatters
     class Bunyan < Base
-      attr_accessor :jsonize
+      attr_accessor :jsonize, :with_newline
 
       def initialize
         super
         @jsonize = true
+        @with_newline = true
       end
 
       def call(severity, time, progname, data)
@@ -44,7 +45,9 @@ module Ougai
       def dump(data)
         return data unless @jsonize
         data[:time] = data[:time].iso8601(3)
-        JSON.generate(data) + "\n"
+        str = JSON.generate(data)
+        str << "\n" if @with_newline
+        str
       end
     end
   end

data/lib/ougai/version.rb

@@ -1,3 +1,3 @@
 module Ougai
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/spec/formatters/bunyan_spec.rb

@@ -20,16 +20,18 @@ describe Ougai::Formatters::Bunyan do
 
   let(:formatter) { described_class.new }
 
-  context 'when severity is DEBUG' do
-    subject { JSON.parse(formatter.call('DEBUG', Time.now, nil, data).chomp, symbolize_names: true) }
+  context 'jsonize is true and with_newline is true' do
+    subject { formatter.call('DEBUG', Time.now, nil, data) }
 
     it 'includes valid strings' do
-      expect(subject).to include(data.merge(level: 20))
-      expect(subject[:time]).to match(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)
+      expect(subject).to end_with("\n")
+      result = JSON.parse(subject.chomp, symbolize_names: true)
+      expect(result).to include(data.merge(level: 20))
+      expect(result[:time]).to match(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)
     end
   end
 
-  context 'jsonize is falsey' do
+  context 'jsonize is false' do
     before do
       formatter.jsonize = false
     end
@@ -79,4 +81,20 @@ describe Ougai::Formatters::Bunyan do
       end
     end
   end
+
+  context 'with_newline is false' do
+    before do
+      formatter.with_newline = false
+    end
+
+    subject { formatter.call('INFO', Time.now, nil, data) }
+
+    it 'includes valid strings' do
+      expect(subject).not_to end_with("\n")
+      result = JSON.parse(subject, symbolize_names: true)
+      expect(result).to include(data.merge(level: 30))
+      expect(result[:time]).to match(/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/)
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ougai
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Toshimitsu Takahashi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-17 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler