fluent_logger_rails 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12def43c2930b106b0de428bf56f70bc474db386a257a2badac0b1ee398bdca4
-  data.tar.gz: a11c8a7176450aa8d0bf737105423d45e4ce4be33fa3b59d4d65099f7b35c0c7
+  metadata.gz: 03bf0245f30becb0ca43fd78ee5470cfa5f20bf9b4e5f06e9168afb9e9085b04
+  data.tar.gz: 52c576538ac4e5c026a4ef0002b3fb1949ed5a82bd8b4a2f2a4ac9d1536304c3
 SHA512:
-  metadata.gz: 251b265b1b628da9a3ec792da8ad3d5882100170ad87ff8d20d19da9f87331cbc728456b7204383744bfda32e84e703f7800426bef82a8914d83223dea3cf0ed
-  data.tar.gz: e3c66a633f44f7d8db4dccd7a00fd078f2fb52027c9992531b4424aef00cc81dc12b71f9197abcf77038ea23164284a08f04cd9e36c64479f293eeff0dfeb63f
+  metadata.gz: 9a532ebb712a7b5cd3c717a708f60eb7824a373b202f2c551123380d753c40b328cbbe07cb618ef69f70147f557c51e1c61a9e57060d2b2f6a35d2d74b43b103
+  data.tar.gz: be04095c6e2d93bef662ac067fc6f054849c97bca4d3919fd1c9dfd2ebacb68563e951da9294ac8bdd1cddd46990b815c6e882d789219a07479f20869521b063

data/CHANGELOG.md

@@ -13,6 +13,20 @@ Enhancements:
 Deprecations:
 * None
 
+## v.0.5.0
+
+Bug Fixes:
+
+* None
+
+Enhancements:
+
+* Add option to allow message to be merged into payload (#8)
+
+Deprecations:
+
+* None
+
 ## v0.4.0
 
 Bug Fixes:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent_logger_rails (0.4.0)
+    fluent_logger_rails (0.5.0)
       activesupport (>= 5.0, < 7)
 
 GEM

data/lib/fluent_logger_rails/tagged_hash_formatter.rb

@@ -6,18 +6,28 @@ module FluentLoggerRails
     # be set in order to not conflict or be overridden.
     attr_accessor :parent_key
 
-    def initialize
-      super
+    def initialize(merge_message_into_payload = false)
+      super()
+      @merge_message_into_payload = merge_message_into_payload
       # Override the Logger::Formatter default to a format that does not have a trailing space
       @datetime_format = "%Y-%m-%dT%H:%M:%S.%6N"
     end
 
     def call(severity, timestamp, _progname, msg)
-      payload = {
-        severity: format_severity(severity),
-        timestamp: format_datetime(timestamp),
-        message: msg.is_a?(String) ? msg.strip : msg,
-      }.merge(compact_tags.deep_dup)
+      payload = if msg.is_a?(Hash) && @merge_message_into_payload
+        msg
+      else
+        {
+          message: msg.is_a?(String) ? msg.strip : msg,
+        }
+      end
+
+      payload = payload.merge(
+        {
+          severity: format_severity(severity),
+          timestamp: format_datetime(timestamp),
+        },
+      ).merge(compact_tags.deep_dup)
 
       @parent_key ? { @parent_key => payload } : payload
     end

data/lib/fluent_logger_rails/version.rb

@@ -1,3 +1,3 @@
 module FluentLoggerRails
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent_logger_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - HackerOne Open Source