logstasher 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 653599eb3d27e38a3c68adfb9cacd8f2d363b36190c7f04691e651bb0d819622
-  data.tar.gz: 5adb9b7b17cb656bc8261e6a873144d313e2e5cecf47b5061e4843de7de18eb3
+  metadata.gz: 33158a121af27be0e9bd17ac2c3e9ac3e40823a52db857ad9954d370d339eb63
+  data.tar.gz: cf62d43543a0b3b6948c1c29233c5eedfd21188f9f0cb6f98fdf9276f933b54f
 SHA512:
-  metadata.gz: b16a9d9f84f67aec9eaafc6a8751ff725d05e968b666c5337305b9b783b00db38fa587e916497613a9de8211ce1f2ec0121ea759ff61f2fee4b9f2601fd80d0f
-  data.tar.gz: 3ba348f58014dff70af4d00af675de5851325b1d3bca19329274cdb09ca9a5e4da23cd31765cc85d83811ea1397a366e5c8b05a4ac2cca42bd95303fecf2e68e
+  metadata.gz: 9f403b9a4d329f51c981ed6b57ab1ff2e6ef4ecc58f0943c59eb6d136b9cbdda39d8a904f02511258972fb99597a66ff75a8f53ac17906e837867400a83d66d7
+  data.tar.gz: 57e572d794e472c73496f163023b3f61379998d0e80a4e9cc73d7c37fbbbf2a1999dd53697b897e0a8034d6362184cd86020162409406ecfd68716014bda9bf0

data/lib/logstasher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'logstasher/version'
 require 'logstasher/active_support/log_subscriber'
 require 'logstasher/active_support/mailer_log_subscriber'
@@ -109,8 +111,8 @@ module LogStasher
     self.logger = config.logger || new_logger(logger_path)
     logger.level = config.log_level || Logger::WARN
     self.source = config.source unless config.source.nil?
-    self.log_controller_parameters = !!config.log_controller_parameters
-    self.backtrace = !!config.backtrace unless config.backtrace.nil?
+    self.log_controller_parameters = !config.log_controller_parameters.nil?
+    self.backtrace = !config.backtrace.nil? unless config.backtrace.nil?
     set_data_for_rake
     set_data_for_console
     self.field_renaming = Hash(config.field_renaming)
@@ -125,7 +127,7 @@ module LogStasher
   end
 
   def called_as_rake?
-    File.basename($0) == 'rake'
+    File.basename($PROGRAM_NAME) == 'rake'
   end
 
   def called_as_console?
@@ -160,7 +162,7 @@ module LogStasher
   #   LogStasher.info("message", timing:1234)
   #   LogStasher.info(custom1:"yes", custom2:"no")
   def log(severity, message, additional_fields = {})
-    if logger && logger.send("#{severity}?")
+    if logger&.send("#{severity}?")
 
       data = { 'level' => severity }
       if message.respond_to?(:to_hash)
@@ -173,7 +175,7 @@ module LogStasher
       tags = Array(additional_fields.delete(:tags) || 'log')
 
       data.merge!(additional_fields)
-      logger << build_logstash_event(data, tags).to_json + "\n"
+      logger << "#{build_logstash_event(data, tags).to_json}\n"
 
     end
   end

data/lib/logstasher/action_view/log_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/notifications'
 require 'action_view/log_subscriber'
 require 'logstasher/custom_fields'
@@ -31,7 +33,7 @@ module LogStasher
 
         tags = []
         tags.push('exception') if data[:exception]
-        logger << LogStasher.build_logstash_event(data, tags).to_json + "\n"
+        logger << "#{LogStasher.build_logstash_event(data, tags).to_json}\n"
       end
 
       def extract_data(data)

data/lib/logstasher/active_job/log_subscriber.rb

@@ -1,18 +1,19 @@
+# frozen_string_literal: true
+
 # For Rails 6.0 or below, require the logging module which contains LogSubscriber
-if ActiveJob::VERSION::MAJOR < 6 || (ActiveJob::VERSION::MAJOR == 6 && ActiveJob::VERSION::MINOR == 0)
-  require 'active_job/logging' 
+if ActiveJob::VERSION::MAJOR < 6 || (ActiveJob::VERSION::MAJOR == 6 && ActiveJob::VERSION::MINOR.zero?)
+  require 'active_job/logging'
 else
   require 'active_job/log_subscriber'
 end
 
 module LogStasher
   module ActiveJob
-
     BASE_SUBSCRIBER = if defined?(::ActiveJob::LogSubscriber)
-      ::ActiveJob::LogSubscriber
-    else
-      ::ActiveJob::Logging::LogSubscriber
-    end
+                        ::ActiveJob::LogSubscriber
+                      else
+                        ::ActiveJob::Logging::LogSubscriber
+                      end
 
     class LogSubscriber < BASE_SUBSCRIBER
       def enqueue(event)
@@ -61,7 +62,7 @@ module LogStasher
 
         tags = ['job', type]
         tags.push('exception') if data[:exception]
-        logger << LogStasher.build_logstash_event(data, tags).to_json + "\n"
+        logger << "#{LogStasher.build_logstash_event(data, tags).to_json}\n"
       end
 
       def extract_metadata(event)
@@ -91,9 +92,8 @@ module LogStasher
 
       # The default args_info makes a string. We need objects to turn into JSON.
       def args_info(job)
-        job.arguments.map { |arg| arg.try(:to_global_id).try(:to_s) || arg }
+        ::ActiveJob::Arguments.serialize(job.arguments)
       end
     end
   end
 end
-

data/lib/logstasher/active_record/log_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/notifications'
 require 'active_record/log_subscriber'
 require 'logstasher/custom_fields'
@@ -9,7 +11,7 @@ module LogStasher
 
       def identity(event)
         lsevent = logstash_event(event)
-        logger << lsevent.to_json + "\n" if logger && lsevent
+        logger << "#{lsevent.to_json}\n" if logger && lsevent
       end
       alias sql identity
 
@@ -23,7 +25,7 @@ module LogStasher
         self.class.runtime += event.duration
         data = event.payload.dup
 
-        return if 'SCHEMA' == data[:name]
+        return if data[:name] == 'SCHEMA'
 
         # A connection cannot be converted to JSON as it fails with
         # SystemStackError when running against ActiveSupport JSON patches.

data/lib/logstasher/active_support/log_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/class/attribute'
 require 'active_support/log_subscriber'
 require 'logstasher/custom_fields'
@@ -20,7 +22,7 @@ module LogStasher
 
         tags = ['request']
         tags.push('exception') if payload[:exception]
-        logger << LogStasher.build_logstash_event(data, tags).to_json + "\n"
+        logger << "#{LogStasher.build_logstash_event(data, tags).to_json}\n"
       end
 
       def redirect_to(event)
@@ -48,11 +50,7 @@ module LogStasher
       end
 
       def extract_format(payload)
-        if ::ActionPack::VERSION::MAJOR == 3 && ::ActionPack::VERSION::MINOR == 0
-          payload[:formats].first
-        else
-          payload[:format]
-        end
+        payload[:format]        
       end
 
       def extract_status(payload)

data/lib/logstasher/active_support/mailer_log_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/class/attribute'
 require 'active_support/log_subscriber'
 
@@ -31,7 +33,7 @@ module LogStasher
 
       def process_event(event, tags)
         data = LogStasher.request_context.merge(extract_metadata(event.payload))
-        logger << LogStasher.build_logstash_event(data, tags).to_json + "\n"
+        logger << "#{LogStasher.build_logstash_event(data, tags).to_json}\n"
       end
 
       def extract_metadata(payload)

data/lib/logstasher/custom_fields.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LogStasher
   module CustomFields
     module LogSubscriber

data/lib/logstasher/device/redis.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'redis'
 
 module LogStasher
@@ -22,7 +24,7 @@ module LogStasher
       def redis_options
         unless @redis_options
           default_keys = default_options.keys
-          @redis_options = options.select { |k, _v| !default_keys.include?(k) }
+          @redis_options = options.reject { |k, _v| default_keys.include?(k) }
         end
 
         @redis_options

data/lib/logstasher/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'time'
 require 'date'

data/lib/logstasher/rails_ext/action_controller/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LogStasher
   module ActionController
     module Instrumentation

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActionController
   module Instrumentation
     alias orig_process_action process_action

data/lib/logstasher/rails_ext/rack/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/rack/logger'
 
 module Rails

data/lib/logstasher/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/railtie'
 require 'action_view/log_subscriber'
 require 'action_controller/log_subscriber'
@@ -20,7 +22,7 @@ module LogStasher
     config_file = File.expand_path './config/logstasher.yml'
 
     # Load and ERB templating of YAML files
-    LOGSTASHER = File.exist?(config_file) ? YAML.load(ERB.new(File.read(config_file)).result).symbolize_keys : nil
+    LOGSTASHER = File.exist?(config_file) ? YAML.safe_load(ERB.new(File.read(config_file)).result).symbolize_keys : nil
 
     initializer :logstasher, before: :load_config_initializers do |app|
       if LOGSTASHER.present?
@@ -42,7 +44,7 @@ module LogStasher
     end
 
     def rack_cache_hashlike?(app)
-      app.config.action_dispatch.rack_cache && app.config.action_dispatch.rack_cache.respond_to?(:[]=)
+      app.config.action_dispatch.rack_cache&.respond_to?(:[]=)
     end
   end
 
@@ -55,7 +57,7 @@ module LogStasher
       # get all available IP address lists and use the first one.
       # This will always be `127.0.0.1`.
       address_info = Socket.ip_address_list.first
-      address_info && address_info.ip_address
+      address_info&.ip_address
     else
       IPSocket.getaddress(Socket.gethostname)
     end

data/lib/logstasher/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module LogStasher
-  VERSION = '2.1.1'.freeze
+  VERSION = '2.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstasher
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Shadab Ahmed
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2020-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Awesome rails logs