logstasher 0.2.5 → 0.2.8

data/README.md

@@ -55,8 +55,8 @@ In your Gemfile:
     # Enable the logstasher logs for the current environment
     config.logstasher.enabled = true
 
-    # This line is optional if you do not want to supress app logs in your <environment>.log
-    config.logstasher.supress_app_log = false
+    # This line is optional if you do not want to suppress app logs in your <environment>.log
+    config.logstasher.suppress_app_log = false
 
 ## Adding custom fields to the log
 
@@ -66,6 +66,8 @@ Since some fields are very specific to your application for e.g. *user_name*, so
 
     if LogStasher.enabled
       LogStasher.add_custom_fields do |fields|
+        # This block is run in application_controller context, 
+        # so you have access to all controller methods
         fields[:user] = current_user && current_user.mail
         fields[:site] = request.path =~ /^\/api/ ? 'api' : 'user'
 

data/lib/logstasher.rb

@@ -56,12 +56,17 @@ module LogStasher
   end
 
   def self.suppress_app_logs(app)
-    if app.config.logstasher.supress_app_log.nil? || app.config.logstasher.supress_app_log
+    if configured_to_suppress_app_logs?(app)
       require 'logstasher/rails_ext/rack/logger'
       LogStasher.remove_existing_log_subscriptions
     end
   end
 
+  def self.configured_to_suppress_app_logs?(app)
+    # This supports both spellings: "suppress_app_log" and "supress_app_log"
+    !!(app.config.logstasher.suppress_app_log.nil? ? app.config.logstasher.supress_app_log : app.config.logstasher.suppress_app_log)
+  end
+
   def self.custom_fields
     Thread.current[:logstasher_custom_fields] ||= []
   end

data/lib/logstasher/version.rb

@@ -1,3 +1,3 @@
 module LogStasher
-  VERSION = "0.2.5"
+  VERSION = "0.2.8"
 end

data/spec/logstasher_spec.rb

@@ -77,14 +77,32 @@ describe LogStasher do
     end
   end
 
-  describe '.supress_app_logs' do
-    let(:logstasher_config){ mock(:logstasher => mock(:supress_app_log => true))}
+  describe '.suppress_app_logs' do
+    let(:logstasher_config){ mock(:logstasher => mock(:suppress_app_log => true))}
     let(:app){ mock(:config => logstasher_config)}
     it 'removes existing subscription if enabled' do
       LogStasher.should_receive(:require).with('logstasher/rails_ext/rack/logger')
       LogStasher.should_receive(:remove_existing_log_subscriptions)
       LogStasher.suppress_app_logs(app)
     end
+
+    context 'when disabled' do
+      let(:logstasher_config){ mock(:logstasher => mock(:suppress_app_log => false)) }
+      it 'does not remove existing subscription' do
+        LogStasher.should_not_receive(:remove_existing_log_subscriptions)
+        LogStasher.suppress_app_logs(app)
+      end
+
+      describe "backward compatibility" do
+        context 'with spelling "supress_app_log"' do
+          let(:logstasher_config){ mock(:logstasher => mock(:suppress_app_log => nil, :supress_app_log => false)) }
+          it 'does not remove existing subscription' do
+            LogStasher.should_not_receive(:remove_existing_log_subscriptions)
+            LogStasher.suppress_app_logs(app)
+          end
+        end
+      end
+    end
   end
 
   describe '.appended_params' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logstasher
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-07 00:00:00.000000000 Z
+date: 2013-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-event
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 66757699131384912
+      hash: -3954603627372273553
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 66757699131384912
+      hash: -3954603627372273553
 requirements: []
 rubyforge_project: logstasher
 rubygems_version: 1.8.25