fluent_logger_rails 0.4.0 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 12def43c2930b106b0de428bf56f70bc474db386a257a2badac0b1ee398bdca4
4
- data.tar.gz: a11c8a7176450aa8d0bf737105423d45e4ce4be33fa3b59d4d65099f7b35c0c7
3
+ metadata.gz: 03bf0245f30becb0ca43fd78ee5470cfa5f20bf9b4e5f06e9168afb9e9085b04
4
+ data.tar.gz: 52c576538ac4e5c026a4ef0002b3fb1949ed5a82bd8b4a2f2a4ac9d1536304c3
5
5
  SHA512:
6
- metadata.gz: 251b265b1b628da9a3ec792da8ad3d5882100170ad87ff8d20d19da9f87331cbc728456b7204383744bfda32e84e703f7800426bef82a8914d83223dea3cf0ed
7
- data.tar.gz: e3c66a633f44f7d8db4dccd7a00fd078f2fb52027c9992531b4424aef00cc81dc12b71f9197abcf77038ea23164284a08f04cd9e36c64479f293eeff0dfeb63f
6
+ metadata.gz: 9a532ebb712a7b5cd3c717a708f60eb7824a373b202f2c551123380d753c40b328cbbe07cb618ef69f70147f557c51e1c61a9e57060d2b2f6a35d2d74b43b103
7
+ data.tar.gz: be04095c6e2d93bef662ac067fc6f054849c97bca4d3919fd1c9dfd2ebacb68563e951da9294ac8bdd1cddd46990b815c6e882d789219a07479f20869521b063
data/CHANGELOG.md CHANGED
@@ -13,6 +13,20 @@ Enhancements:
13
13
  Deprecations:
14
14
  * None
15
15
 
16
+ ## v.0.5.0
17
+
18
+ Bug Fixes:
19
+
20
+ * None
21
+
22
+ Enhancements:
23
+
24
+ * Add option to allow message to be merged into payload (#8)
25
+
26
+ Deprecations:
27
+
28
+ * None
29
+
16
30
  ## v0.4.0
17
31
 
18
32
  Bug Fixes:
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- fluent_logger_rails (0.4.0)
4
+ fluent_logger_rails (0.5.0)
5
5
  activesupport (>= 5.0, < 7)
6
6
 
7
7
  GEM
@@ -6,18 +6,28 @@ module FluentLoggerRails
6
6
  # be set in order to not conflict or be overridden.
7
7
  attr_accessor :parent_key
8
8
 
9
- def initialize
10
- super
9
+ def initialize(merge_message_into_payload = false)
10
+ super()
11
+ @merge_message_into_payload = merge_message_into_payload
11
12
  # Override the Logger::Formatter default to a format that does not have a trailing space
12
13
  @datetime_format = "%Y-%m-%dT%H:%M:%S.%6N"
13
14
  end
14
15
 
15
16
  def call(severity, timestamp, _progname, msg)
16
- payload = {
17
- severity: format_severity(severity),
18
- timestamp: format_datetime(timestamp),
19
- message: msg.is_a?(String) ? msg.strip : msg,
20
- }.merge(compact_tags.deep_dup)
17
+ payload = if msg.is_a?(Hash) && @merge_message_into_payload
18
+ msg
19
+ else
20
+ {
21
+ message: msg.is_a?(String) ? msg.strip : msg,
22
+ }
23
+ end
24
+
25
+ payload = payload.merge(
26
+ {
27
+ severity: format_severity(severity),
28
+ timestamp: format_datetime(timestamp),
29
+ },
30
+ ).merge(compact_tags.deep_dup)
21
31
 
22
32
  @parent_key ? { @parent_key => payload } : payload
23
33
  end
@@ -1,3 +1,3 @@
1
1
  module FluentLoggerRails
2
- VERSION = '0.4.0'
2
+ VERSION = '0.5.0'
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fluent_logger_rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.0
4
+ version: 0.5.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - HackerOne Open Source