request_headers_logger 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 426a124479eca311531e5bfea76dd501c1d18d91
-  data.tar.gz: 5f0588b3dd89067b276b144a826360511a8bab6d
+  metadata.gz: 470b462a8ffc11750785e8efc88d477d2efd61f5
+  data.tar.gz: ff88013a271b1c3f21b9b91219007b3b6016a45a
 SHA512:
-  metadata.gz: fc35c05ebc50865e5475852bdcdf8d987a90470cb4b3fda32582429b77d0de04e3d7f6c581662b9a64cf32a89856aef90e46fa308f0ae571cbdf670ad783420b
-  data.tar.gz: 9f683fc2afee57432db86b18fe506e174fb8966467c080c479f57c8dc827d1689357e11f8ecbb2f76c3d6fe894b8318b1346a5abdb90b806a5052a6b9ec85f4e
+  metadata.gz: 10084ec99b39e60ff233e5426ba82d6a47f021732dfc09780168cd966fb3940f45672386b92bfc47012212f77c341aa4e6ae74e7c2127d2cb70de6a3caba562d
+  data.tar.gz: 83bdd44b690bccf5714590a14984c292efc2006c2d7c37036cab309b5aaa4ed11d0eecf1066ef09de0e37b8342b89d21005a315271036d3b28be26a1b9c299c8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    request_headers_logger (0.0.2)
+    request_headers_logger (0.0.4)
       request_headers_middleware (~> 0.0.4)
 
 GEM

data/README.md

@@ -31,6 +31,16 @@ $ bundle
 That's it now Delayed job logs should show the *X-Request-Id* from the http request.
 
 
+### Configure RequestHeadersLogger
+
+```
+ RequestHeadersLogger.configure do |config|
+  config[:logger_format] = 'json'         # Options [text json] default: text
+  config[:tag_format] = 'key_val'         # Options: [val key_val] default: val
+  config[:Loggers] << MessageQueue.logger # List of all loggers used.
+end
+```
+
 ### Whitelist
 
 Per default the delayed job plug in applies a whitelist to only filter *X-Request-Id* header from the store. To white list new flags, you can do the following.

data/lib/request_headers_logger.rb

@@ -16,8 +16,6 @@ module RequestHeadersLogger # :nodoc:
 
   def configure
     yield @configuration
-
-    prepare_loggers
   end
 
   def tags
@@ -36,16 +34,17 @@ module RequestHeadersLogger # :nodoc:
     @configuration[:loggers]
   end
 
-  private
-
   def prepare_loggers
     loggers.each do |logger|
       logger_formatter logger
     end
   end
 
+  private
+
   def logger_formatter(logger)
-    logger.tap { |obj| obj.formatter = formatter_class.new }
+    logger.formatter ||= Logger::Formatter.new
+    logger.formatter.extend formatter_class
   end
 
   def formatter_class

data/lib/request_headers_logger/delayed_job/request_header_delayed_plugin.rb

@@ -26,8 +26,9 @@ module RequestHeadersLogger
         loggers = [Delayed::Worker.logger]
         loggers << ::Rails.logger
 
-        config[:loggers] = loggers
+        config[:loggers].push(loggers).flatten!.uniq!
       end
+      RequestHeadersLogger.prepare_loggers
     end
   end
 end

data/lib/request_headers_logger/json_formatter.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module RequestHeadersLogger
-  class JsonFormatter
+  module JsonFormatter
     def call(severity, timestamp, progname, msg)
       json = { level: severity, timestamp: timestamp.to_s, message: msg.strip }
       json = json.merge(progname: progname.to_s) unless progname.nil?

data/lib/request_headers_logger/message_queue/message_queue_plugin.rb

@@ -22,10 +22,10 @@ module RequestHeadersLogger
       end
 
       lifecycle.before(:consume) do |delivery_info, properties, payload|
-        store = symbolize(properties.headers).dig(:store) || {}
+        store = symbolize(properties.headers)&.dig(:store) || {}
         RequestHeadersMiddleware.store = store
 
-        set_dj_loggers
+        set_mq_loggers
       end
 
       lifecycle.after(:consume) do |delivery_info, properties, payload|
@@ -33,10 +33,11 @@ module RequestHeadersLogger
       end
     end
 
-    def self.set_dj_loggers
+    def self.set_mq_loggers
       RequestHeadersLogger.configure do |config|
-        config[:loggers] = [MessageQueue.logger]
+        config[:loggers] << MessageQueue.logger
       end
+      RequestHeadersLogger.prepare_loggers
     end
   end
 end

data/lib/request_headers_logger/text_formatter.rb

@@ -1,9 +1,22 @@
 # frozen_string_literal: true
 
+require 'English'
+
 module RequestHeadersLogger
-  class TextFormatter < ::Logger::Formatter
-    def call(severity, timestamp, progname, msg)
-      super(severity, timestamp, progname, "#{tags_text}#{msg}")
+  module TextFormatter
+    def call(severity, time, progname, msg)
+      format(::Logger::Formatter::Format,
+             severity_name(severity)[0],
+             format_datetime(time),
+             $PID,
+             severity_name(severity),
+             progname,
+             msg2str("#{tags_text}#{msg}"))
+    end
+
+    def severity_name(severity)
+      return Logger::Severity.constants[severity].to_s if severity.is_a?(Integer)
+      severity
     end
 
     def tags_text

data/lib/request_headers_logger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RequestHeadersLogger
-  VERSION = '0.0.2'
+  VERSION = '0.0.4'
 end

data/spec/json_formatter_spec.rb

@@ -9,7 +9,8 @@ RSpec.describe RequestHeadersLogger::JsonFormatter do
   let(:logger) do
     logger = Logger.new(buffer)
     logger.progname = 'dummy'
-    logger.formatter = RequestHeadersLogger::JsonFormatter.new
+    logger.formatter = Logger::Formatter.new
+    logger.formatter.extend RequestHeadersLogger::JsonFormatter
     logger
   end
 

data/spec/text_formatter_spec.rb

@@ -7,7 +7,8 @@ RSpec.describe RequestHeadersLogger::TextFormatter do
   let(:logger) do
     logger = Logger.new(buffer)
     logger.progname = 'dummy'
-    logger.formatter = RequestHeadersLogger::TextFormatter.new
+    logger.formatter = Logger::Formatter.new
+    logger.formatter.extend RequestHeadersLogger::TextFormatter
     logger
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: request_headers_logger
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - Al-waleed Shihadeh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: request_headers_middleware