semantic_logger 4.2.1 → 4.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65aba46ee7052dc3653a61a40fad4d69aed81e97
-  data.tar.gz: 2c7b49cb33e90874a966b9cadbbadf99bc4f4291
+  metadata.gz: 5e2a3fa7d0cba9f44c7a64abbc17d3fe77a10174
+  data.tar.gz: bca2b99107ef30043276c03b5ea09cacb4065129
 SHA512:
-  metadata.gz: a2ef7fb0d78bdb3ecac1ff6d8ef6cef1bb4797a7a0ac55b2cfab4f057d8f7c2c16519b37863a6fc1d8e728277765c678824d8234e3cfdf733386cf7f5ddeb073
-  data.tar.gz: e8df29aebb5e16b47fe87d530daf5f822c436ab18ddba47d682799ddb5c048041ce63841f1c6430987ca89e196f99853c48ecb38c8a9b2a0b65b8e3fbfae1d7a
+  metadata.gz: 4c5afd6c5af4110f7f63adbdce4fbd419c9c33c88522d3c3a36acc3d2335dacc0d34f79bdd2775f0b0eadb9cf4d6284b0c0cbe514011bd323b346e54ca0ae525
+  data.tar.gz: e7f2cbf6618aed0c38b10312dee1008b5eb4cf98809525826a2460c3003bb82816e043bde83dd9c56ccf9475e018e352f4cecfa14cd8674c305c3af44999ec38

data/lib/semantic_logger/formatters/raw.rb

@@ -34,7 +34,7 @@ module SemanticLogger
 
       # Process info
       def process_info
-        hash[:pid]    = $PROCESS_ID
+        hash[:pid]    = $$
         hash[:thread] = log.thread_name
 
         file, line = log.file_name_and_line

data/lib/semantic_logger/log.rb

@@ -149,7 +149,7 @@ module SemanticLogger
         if result.is_a?(String)
           message = message.nil? ? result : "#{message} -- #{result}"
           assign(message: message, payload: payload, exception: exception)
-        elsif message.nil? && result.is_a?(Hash)
+        elsif message.nil? && result.is_a?(Hash) && [:message, :payload, :exception].any? { |k| result.key? k }
           assign(result)
         elsif payload&.respond_to?(:merge)
           assign(message: message, payload: payload.merge(result), exception: exception)
@@ -240,7 +240,7 @@ module SemanticLogger
       file, line = file_name_and_line(true)
       file_name  = " #{file}:#{line}" if file
 
-      "#{$PROCESS_ID}:#{format("%.#{thread_name_length}s", thread_name)}#{file_name}"
+      "#{$$}:#{format("%.#{thread_name_length}s", thread_name)}#{file_name}"
     end
 
     CALLER_REGEXP = /^(.*):(\d+).*/

data/lib/semantic_logger/version.rb

@@ -1,3 +1,3 @@
 module SemanticLogger
-  VERSION = '4.2.1'.freeze
+  VERSION = '4.2.2'.freeze
 end

data/test/appender/file_test.rb

@@ -96,7 +96,7 @@ module Appender
 
             duration_str = log.duration ? " (#{format('%.1f', log.duration)}ms)" : ''
 
-            "#{log.formatted_time} #{log.level.to_s.upcase} [#{$PROCESS_ID}:#{log.thread_name}] #{tags}#{log.name} -- #{message}#{duration_str}"
+            "#{log.formatted_time} #{log.level.to_s.upcase} [#{$$}:#{log.thread_name}] #{tags}#{log.name} -- #{message}#{duration_str}"
           end
         end
 

data/test/appender/kafka_test.rb

@@ -26,7 +26,7 @@ module Appender
         assert_equal 'info', h['level']
         assert_equal @message, h['message']
         assert_equal 'SemanticLogger::Appender::Kafka', h['name']
-        assert_equal $PROCESS_ID, h['pid']
+        assert_equal $$, h['pid']
 
         assert_equal 'log_messages', options[:topic]
       end

data/test/appender/mongodb_test.rb

@@ -29,7 +29,7 @@ module Appender
           assert_equal 'thread', document['thread']
           assert document['time'].is_a?(Time)
           assert_nil document['payload']
-          assert_equal $PROCESS_ID, document['pid']
+          assert_equal $$, document['pid']
           assert_equal 'test', document['host']
           assert_equal 'test_application', document['application']
         end
@@ -45,7 +45,7 @@ module Appender
           assert payload = document['payload']
           assert_equal 12_345, payload['tracking_number'], payload
           assert_equal 'HSSKLEU@JDK767', payload['session_id']
-          assert_equal $PROCESS_ID, document['pid']
+          assert_equal $$, document['pid']
           assert_equal 'test', document['host']
           assert_equal 'test_application', document['application']
         end
@@ -61,7 +61,7 @@ module Appender
           assert payload = document['payload']
           assert_equal 12_345, payload['tracking_number'], payload
           assert_equal 'HSSKLEU@JDK767', payload['session_id']
-          assert_equal $PROCESS_ID, document['pid']
+          assert_equal $$, document['pid']
           assert_equal 'test', document['host']
           assert_equal 'test_application', document['application']
         end
@@ -74,7 +74,7 @@ module Appender
           assert_equal 'hello world', document['message']
           assert_equal 'thread', document['thread']
           assert document['time'].is_a?(Time)
-          assert_equal $PROCESS_ID, document['pid']
+          assert_equal $$, document['pid']
           assert_equal 'test', document['host']
           assert_equal 'test_application', document['application']
         end
@@ -93,7 +93,7 @@ module Appender
             assert payload = document['payload']
             assert_equal 12_345, payload['tracking_number'], payload
             assert_equal 'HSSKLEU@JDK767', payload['session_id']
-            assert_equal $PROCESS_ID, document['pid']
+            assert_equal $$, document['pid']
             assert_equal 'test', document['host'], document.ai
             assert_equal 'test_application', document['application']
           end

data/test/appender/syslog_test.rb

@@ -45,7 +45,7 @@ module Appender
           Syslog.stub(:open, nil) do
             Syslog.stub(:log, nil) do
               syslog_appender = SemanticLogger::Appender::Syslog.new
-              syslog_appender.send(level, 'AppenderSyslogTest #{level.to_s} message')
+              syslog_appender.send(level, "AppenderSyslogTest #{level} message")
             end
           end
         end

data/test/formatters/color_test.rb

@@ -131,7 +131,7 @@ module SemanticLogger
 
         describe 'call' do
           it 'returns minimal elements' do
-            assert_equal "#{expected_time} #{color}D#{clear} [#{$PROCESS_ID}:#{Thread.current.name}] #{color}ColorTest#{clear}", formatter.call(log, nil)
+            assert_equal "#{expected_time} #{color}D#{clear} [#{$$}:#{Thread.current.name}] #{color}ColorTest#{clear}", formatter.call(log, nil)
           end
 
           it 'retuns all elements' do
@@ -143,7 +143,7 @@ module SemanticLogger
             log.backtrace  = backtrace
             set_exception
             duration = SemanticLogger::Formatters::Base::PRECISION == 3 ? '1' : '1.346'
-            str      = "#{expected_time} #{color}D#{clear} [#{$PROCESS_ID}:#{Thread.current.name} default_test.rb:35] [#{color}first#{clear}] [#{color}second#{clear}] [#{color}third#{clear}] {#{color}first: 1#{clear}, #{color}second: 2#{clear}, #{color}third: 3#{clear}} (#{bold}#{duration}ms#{clear}) #{color}ColorTest#{clear} -- Hello World -- #{{first: 1, second: 2, third: 3}.ai(multiline: false)} -- Exception: #{color}RuntimeError: Oh no#{clear}\n"
+            str      = "#{expected_time} #{color}D#{clear} [#{$$}:#{Thread.current.name} default_test.rb:35] [#{color}first#{clear}] [#{color}second#{clear}] [#{color}third#{clear}] {#{color}first: 1#{clear}, #{color}second: 2#{clear}, #{color}third: 3#{clear}} (#{bold}#{duration}ms#{clear}) #{color}ColorTest#{clear} -- Hello World -- #{{first: 1, second: 2, third: 3}.ai(multiline: false)} -- Exception: #{color}RuntimeError: Oh no#{clear}\n"
             assert_equal str, formatter.call(log, nil).lines.first
           end
         end

data/test/formatters/default_test.rb

@@ -70,13 +70,13 @@ module SemanticLogger
 
         describe 'process_info' do
           it 'logs pid and thread name' do
-            assert_equal "[#{$PROCESS_ID}:#{Thread.current.name}]", formatter.process_info
+            assert_equal "[#{$$}:#{Thread.current.name}]", formatter.process_info
           end
 
           it 'logs pid, thread name, and file name' do
             set_exception
             log.backtrace = backtrace
-            assert_equal "[#{$PROCESS_ID}:#{Thread.current.name} default_test.rb:99]", formatter.process_info
+            assert_equal "[#{$$}:#{Thread.current.name} default_test.rb:99]", formatter.process_info
           end
         end
 
@@ -153,7 +153,7 @@ module SemanticLogger
 
         describe 'call' do
           it 'returns minimal elements' do
-            assert_equal "#{expected_time} D [#{$PROCESS_ID}:#{Thread.current.name}] DefaultTest", formatter.call(log, nil)
+            assert_equal "#{expected_time} D [#{$$}:#{Thread.current.name}] DefaultTest", formatter.call(log, nil)
           end
 
           it 'retuns all elements' do
@@ -165,7 +165,7 @@ module SemanticLogger
             log.backtrace  = backtrace
             set_exception
             duration = SemanticLogger::Formatters::Base::PRECISION == 3 ? '1' : '1.346'
-            str      = "#{expected_time} D [#{$PROCESS_ID}:#{Thread.current.name} default_test.rb:99] [first] [second] [third] {first: 1, second: 2, third: 3} (#{duration}ms) DefaultTest -- Hello World -- {:first=>1, :second=>2, :third=>3} -- Exception: RuntimeError: Oh no\n"
+            str      = "#{expected_time} D [#{$$}:#{Thread.current.name} default_test.rb:99] [first] [second] [third] {first: 1, second: 2, third: 3} (#{duration}ms) DefaultTest -- Hello World -- {:first=>1, :second=>2, :third=>3} -- Exception: RuntimeError: Oh no\n"
             assert_equal str, formatter.call(log, nil).lines.first
           end
         end

data/test/logger_test.rb

@@ -88,6 +88,13 @@ class LoggerTest < Minitest::Test
             assert_equal payload, log.payload
           end
 
+          it 'logs payload from block' do
+            logger.send(level) { { 'test_key1' => 'hello world', 'test_key2' => payload} }
+
+            assert log = log_message
+            assert_equal log.payload, { 'test_key1' => 'hello world', 'test_key2' => payload }
+          end
+
           it 'logs payload only' do
             logger.send(level, payload: payload)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: semantic_logger
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.2.2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby