logstasher 0.8.6 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cd872fd46b65b87a696f803f2bfb8b1d7c28f68
-  data.tar.gz: 96b5fb2cba085b14a49292c3dca769dc2f7297d3
+  metadata.gz: 91e7c9a0ab40af2e0f9e71ea61fde24dfc2dfd9d
+  data.tar.gz: 4a89eb5bcf8cba52d1ae269ffc00cf9df733211c
 SHA512:
-  metadata.gz: 382d9083a01c03c88d20b04ffdd648e651ab88f664c3dd12d0d13fb4fd31ff9b9a84b92d4e5ae727a3fc51a08d2af98ce5f24e6823dc3a6db3b0ceabedfc8b9f
-  data.tar.gz: 0db4b1109250de48f0b00156209744bdb5bd4a013a57531d94f9849e57df23fe031747f857c498fc25ab87d348f44f96d8a0beff84210913eee60fb128f4c961
+  metadata.gz: 055f322b5f2abdab76f784844970691e7845cc3e216f4f37f35a79f61192049c3ced249b6eed9b8477c3c776c81bbba52ff7f0ac0c29652eabdedfee2541f332
+  data.tar.gz: 3076cb4c8bf1e8e8dc0cefaa348f6ca7350d36b984cf01da6ee7b57ce92d697ca1f141b6406b15f5034a025ed5cff405f7f242f9c205c3e32fda9e4b88f68162

data/lib/logstasher.rb

@@ -14,7 +14,7 @@ module LogStasher
   STORE_KEY = :logstasher_data
   REQUEST_CONTEXT_KEY = :logstasher_request_context
 
-  attr_accessor :logger, :logger_path, :enabled, :log_controller_parameters, :source, :backtrace, 
+  attr_accessor :logger, :logger_path, :enabled, :log_controller_parameters, :source, :backtrace,
     :controller_monkey_patch
   # Setting the default to 'unknown' to define the default behaviour
   @source = 'unknown'
@@ -87,15 +87,15 @@ module LogStasher
   def setup_before(config)
     require 'logstash-event'
     self.enabled = config.enabled
-    LogStasher::ActiveSupport::LogSubscriber.attach_to :action_controller
-    LogStasher::ActiveSupport::MailerLogSubscriber.attach_to :action_mailer
-    LogStasher::ActiveRecord::LogSubscriber.attach_to :active_record
-    LogStasher::ActionView::LogSubscriber.attach_to :action_view
+    LogStasher::ActiveSupport::LogSubscriber.attach_to :action_controller if config.controller_enabled
+    LogStasher::ActiveSupport::MailerLogSubscriber.attach_to :action_mailer if config.mailer_enabled
+    LogStasher::ActiveRecord::LogSubscriber.attach_to :active_record if config.record_enabled
+    LogStasher::ActionView::LogSubscriber.attach_to :action_view if config.view_enabled
   end
 
   def setup(config)
     # Path instrumentation class to insert our hook
-    if (! config.controller_monkey_patch && config.controller_monkey_patch != false) || config.controller_monkey_patch == true 
+    if (! config.controller_monkey_patch && config.controller_monkey_patch != false) || config.controller_monkey_patch == true
       require 'logstasher/rails_ext/action_controller/metal/instrumentation'
     end
     self.suppress_app_logs(config)

data/lib/logstasher/action_view/log_subscriber.rb

@@ -62,7 +62,6 @@ module LogStasher
 
       def extract_custom_fields(data)
         custom_fields = (!LogStasher.custom_fields.empty? && data.extract!(*LogStasher.custom_fields)) || {}
-        LogStasher.custom_fields.clear
         custom_fields
       end
     end

data/lib/logstasher/active_record/log_subscriber.rb

@@ -21,7 +21,6 @@ module LogStasher
       def logstash_event(event)
         data = event.payload
 
-        return unless logger.debug?
         return if 'SCHEMA' == data[:name]
 
         data.merge! runtimes(event)
@@ -52,7 +51,6 @@ module LogStasher
 
       def extract_custom_fields(data)
         custom_fields = (!LogStasher.custom_fields.empty? && data.extract!(*LogStasher.custom_fields)) || {}
-        LogStasher.custom_fields.clear
         custom_fields
       end
     end

data/lib/logstasher/active_support/log_subscriber.rb

@@ -98,7 +98,6 @@ module LogStasher
 
       def extract_custom_fields(payload)
         custom_fields = (!LogStasher.custom_fields.empty? && payload.extract!(*LogStasher.custom_fields)) || {}
-        LogStasher.custom_fields.clear
         custom_fields
       end
     end

data/lib/logstasher/railtie.rb

@@ -1,13 +1,34 @@
 require 'rails/railtie'
 require 'action_view/log_subscriber'
 require 'action_controller/log_subscriber'
+require 'socket'
 
 module LogStasher
   class Railtie < Rails::Railtie
     config.logstasher = ::ActiveSupport::OrderedOptions.new
     config.logstasher.enabled = false
 
+    # Set up the default logging options
+    config.logstasher.controller_enabled = true
+    config.logstasher.mailer_enabled = true
+    config.logstasher.record_enabled = false
+    config.logstasher.view_enabled = true
+
+    # Try loading the config/logstasher.yml if present
+    env = Rails.env.to_sym || :development
+    config_file = File.expand_path "./config/logstasher.yml"
+
+    # Load and ERB templating of YAML files
+    LOGSTASHER = File.exists?(config_file) ? YAML.load(ERB.new(File.read(config_file)).result).symbolize_keys : nil
+
     initializer :logstasher, :before => :load_config_initializers do |app|
+      if LOGSTASHER.present?
+        # process common configs
+        LogStasher.process_config(app.config.logstasher, LOGSTASHER)
+        # process environment specific configs
+        LogStasher.process_config(app.config.logstasher, LOGSTASHER[env].symbolize_keys) if LOGSTASHER.key? env
+      end
+
       app.config.action_dispatch.rack_cache[:verbose] = false if app.config.action_dispatch.rack_cache
       LogStasher.setup_before(app.config.logstasher) if app.config.logstasher.enabled
     end
@@ -18,4 +39,22 @@ module LogStasher
       end
     end
   end
+
+  def process_config(config, yml_config)
+    # Enable the logstasher logs for the current environment
+    config.enabled = yml_config[:enabled] if yml_config.key? :enabled
+    config.controller_enabled = yml_config[:controller_enabled] if yml_config.key? :controller_enabled
+    config.mailer_enabled = yml_config[:mailer_enabled] if yml_config.key? :mailer_enabled
+    config.record_enabled = yml_config[:record_enabled] if yml_config.key? :record_enabled
+    config.view_enabled = yml_config[:view_enabled] if yml_config.key? :view_enabled
+    #
+    # # This line is optional if you do not want to suppress app logs in your <environment>.log
+    config.suppress_app_log = yml_config[:suppress_app_log] if yml_config.key? :suppress_app_log
+    #
+    # # This line is optional, it allows you to set a custom value for the @source field of the log event
+    config.source = yml_config[:source].present? ? yml_config[:source] : IPSocket.getaddress(Socket.gethostname)
+
+    config.backtrace = yml_config[:backtrace] if yml_config.key? :backtrace
+    config.logger_path = yml_config[:logger_path] if yml_config.key? :logger_path
+  end
 end

data/lib/logstasher/version.rb

@@ -1,3 +1,3 @@
 module LogStasher
-  VERSION = "0.8.6"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstasher
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.9.0
 platform: ruby
 authors:
 - Shadab Ahmed
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event