imprint 1.1.5 → 1.2.0

data/lib/imprint/log_helpers.rb

@@ -4,12 +4,10 @@ module Imprint
     # Not relying on default rails logging, more often using lograge
     # Still want to log incoming params safely, which lograge doesn't include
     # this does the same sensative param filtering as rails defaults
-    # it also allows injecting some other variables useful for tracing logs
     def log_entrypoint
       raise "you must call Imprint.configuration and configure the gem before using LogHelpers" if Imprint.configuration.nil?
       log_filter = ActionDispatch::Http::ParameterFilter.new(Imprint.configuration[:log_filters] || Rails.application.config.filter_parameters)
       header_blacklist = Imprint.configuration[:header_blacklist] || []
-      variables_to_append = Imprint.configuration[:variables_to_append] || []
       cookies_whitelist = Imprint.configuration[:cookies_whitelist] || []
 
       http_request_headers = request.headers.select{|header_name, header_value| header_name.match("^HTTP.*") && !header_blacklist.include?(header_name) }
@@ -21,20 +19,14 @@ module Imprint
       end
 
       data_append << " params: "
-      log_filter.filter(params).each_pair{|k,v| data_append << " #{k}=\"#{v}\"" }
-      
-      variables_to_append.each do |var|
-                           var_val = self.instance_variable_get("@#{var}".to_sym).try(:id)
-                           var_val ||= 'nil'
-                           data_append << " #{var}_id=\"#{var_val}\""
-                         end
+      log_filter.filter(request.query_parameters).each_pair{|k,v| data_append << " #{k}=\"#{v}\"" }
       
       cookies_whitelist.each do |cookie_key|
                          cookie_val = cookies[cookie_key] ? cookies[cookie_key] : 'nil'
                          data_append << " #{cookie_key}=\"#{cookie_val}\""
                        end
 
-      logger.info "Started request_method=#{request.method.inspect} request_url=\"#{request.url.inspect}\" at request_time=\"#{Time.now.to_default_s}\" request_ip=#{request.remote_ip.inspect} #{data_append}"
+      logger.info "Started request_method=#{request.method.inspect} request_url=\"#{request.path}\" request_time=\"#{Time.now.to_default_s}\" request_ip=#{request.remote_ip.inspect} #{data_append}"
     rescue
       logger.error "error logging log_entrypoint for request"
     end

data/lib/imprint/rails_logger.rb

@@ -10,8 +10,8 @@ if defined?(ActiveSupport::BufferedLogger)
           # If a newline is necessary then create a new message ending with a newline.
           # Ensures that the original message is not mutated.
           message = "#{message}\n" unless message[-1] == "\n"
-          if (defined?(Imprint::Tracer)) && message && message.is_a?(String) && message.length > 1 && Imprint::Tracer.get_trace_id
-            message = message.gsub("\n"," [trace_id=#{Imprint::Tracer.get_trace_id}]\n")
+          if (defined?(Imprint::Tracer)) && message && message.is_a?(String) && message.length > 1 && Imprint::Tracer.get_trace_id && !message.include?('trace_id=')
+            message = message.gsub("\n"," trace_id=#{Imprint::Tracer.get_trace_id}\n")
           end
           buffer << message
           auto_flush
@@ -24,7 +24,7 @@ if defined?(ActiveSupport::BufferedLogger)
           # Ensures that the original message is not mutated.
           message = "#{message}\n" unless message[-1] == "\n"
           if (defined?(Imprint::Tracer)) && message && message.is_a?(String) && message.length > 1 && Imprint::Tracer.get_trace_id && !message.include?('trace_id=')
-            message = message.gsub("\n"," [trace_id=#{Imprint::Tracer.get_trace_id}]\n")
+            message = message.gsub("\n"," trace_id=#{Imprint::Tracer.get_trace_id}\n")
           end
           @log.add(severity, message, progname, &block)
         end
@@ -43,7 +43,7 @@ if defined?(ActiveSupport::Logger::SimpleFormatter)
       # Ensures that the original message is not mutated.
       message = "#{message}\n" unless message[-1] == "\n"
       if (defined?(Imprint::Tracer)) && message && message.is_a?(String) && message.length > 1 && Imprint::Tracer.get_trace_id && !message.include?('trace_id=')
-        message = message.gsub("\n"," [trace_id=#{Imprint::Tracer.get_trace_id}]\n")
+        message = message.gsub("\n"," trace_id=#{Imprint::Tracer.get_trace_id}\n")
       end
       message
     end

data/lib/imprint/version.rb

@@ -1,3 +1,3 @@
 module Imprint
-  VERSION = "1.1.5"
+  VERSION = "1.2.0"
 end

data/test/unit/log_helpers_test.rb

@@ -62,15 +62,19 @@ class LogHelpersTest < Test::Unit::TestCase
       ''
     end
 
+    def request.path
+      ''
+    end
+
     def request.remote_ip
       ''
     end
 
-    request
-  end
+    def request.query_parameters
+      {}
+    end
 
-  def params
-    {}
+    request
   end
 
   def stub_rails

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imprint
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -147,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4420321569846472065
+      hash: 1212060812570549601
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4420321569846472065
+      hash: 1212060812570549601
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23