logstasher 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9b2dc63137f4569c51a29a7b5430a59191fa82d
-  data.tar.gz: 2db33e2d8e21663bde5537c28a655362e5b69e3c
+  metadata.gz: a145ef20aa7c10ed9477b6e6bebd87234165f75f
+  data.tar.gz: bc3b6bad147c07d139589a5571cc91207fd6bf4b
 SHA512:
-  metadata.gz: 5bd3fbf3c1ffd1309958e4bac528d70289910697b3b5f47f0bcf0b3059c1f83d3cf7e4e5444830e9ebb826164db037c733523a87c5dc11d1c1337f379e850c85
-  data.tar.gz: 65ff96405b9c4cd7cac60384a9da5d0a180c1e50a0b2d2e65b5d1382fb708d7c47511fb996c54503d356c9ebea28f4402ed4e66791e7f58631dbe59de54733b8
+  metadata.gz: fce09c9c21ccb9557f4cd3de6dd159f39fd20613c3d5b2720fa103aa36dc85772bb8ca8bd0e212cec7f73036744487780089afb96a2eaaab090609356cf9e443
+  data.tar.gz: d23b01e0585845e2cadb57dc01adbf74839c00ef25372a93a9b462b8cdf2721f6d2b09e7fc3d992492597c9088a9814013b42b376013c7c5657dccb319b22dda

data/lib/logstasher/action_view/log_subscriber.rb

@@ -26,7 +26,7 @@ module LogStasher
         data.merge! runtimes(event)
         data.merge! extract_data(data)
         data.merge! request_context
-#        data.merge! store
+        data.merge! LogStasher.store
         data.merge! extract_custom_fields(data)
 
         tags = []

data/lib/logstasher/active_record/log_subscriber.rb

@@ -29,6 +29,7 @@ module LogStasher
         data.merge! runtimes(event)
         data.merge! extract_sql(data)
         data.merge! request_context
+        data.merge! LogStasher.store
         data.merge! extract_custom_fields(data)
 
         tags = [ 'request' ]

data/lib/logstasher/active_support/log_subscriber.rb

@@ -15,6 +15,7 @@ module LogStasher
         data.merge! runtimes(event)
         data.merge! location(event)
         data.merge! extract_exception(payload)
+        data.merge! LogStasher.store
         data.merge! extract_custom_fields(payload)
 
         tags = ['request']
@@ -86,7 +87,7 @@ module LogStasher
       def extract_exception(payload)
         if payload[:exception]
           exception, message = payload[:exception]
-          status = ActionDispatch::ExceptionWrapper.status_code_for_exception(exception)
+          status = ::ActionDispatch::ExceptionWrapper.status_code_for_exception(exception)
           if LogStasher.backtrace
             backtrace = $!.backtrace.join("\n")
           else

data/lib/logstasher/rails_ext/action_controller/metal/instrumentation.rb

@@ -42,7 +42,6 @@ module ActionController
         LogStasher.request_context.each do |key, value|
           payload[key] = value
         end
-        LogStasher::CustomFields.clear
         result
       end
     end

data/lib/logstasher/version.rb

@@ -1,3 +1,3 @@
 module LogStasher
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/lib/logstasher.rb

@@ -17,7 +17,7 @@ module LogStasher
   REQUEST_CONTEXT_KEY = :logstasher_request_context
 
   attr_accessor :logger, :logger_path, :enabled, :log_controller_parameters, :source, :backtrace,
-    :controller_monkey_patch
+    :controller_monkey_patch, :field_renaming
   # Setting the default to 'unknown' to define the default behaviour
   @source = 'unknown'
   # By default log the backtrace of exceptions
@@ -112,6 +112,7 @@ module LogStasher
     self.backtrace = !! config.backtrace unless config.backtrace.nil?
     self.set_data_for_rake
     self.set_data_for_console
+    self.field_renaming = Hash(config.field_renaming)
   end
 
   def set_data_for_rake
@@ -177,6 +178,9 @@ module LogStasher
   end
 
   def build_logstash_event(data, tags)
+    field_renaming.each do |old_name, new_name|
+        data[new_name] = data.delete(old_name) if data.key?(old_name)
+    end
     ::LogStash::Event.new(data.merge('source' => self.source, 'tags' => tags))
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstasher
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Shadab Ahmed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-23 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event