graylog2_exceptions 1.2.0 → 1.3.0

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/graylog2_exceptions.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{graylog2_exceptions}
-  s.version = "1.2.0"
+  s.version = "1.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lennart Koopmann"]
-  s.date = %q{2011-02-23}
+  s.date = %q{2011-03-15}
   s.description = %q{A Rack middleware that sends every Exception as GELF message to your Graylog2 server}
   s.email = %q{lennart@socketfeed.com}
   s.extra_rdoc_files = [

data/lib/graylog2_exceptions.rb

@@ -39,16 +39,16 @@ class Graylog2Exceptions
 
   def send_to_graylog2 err
     begin
-      notifier = GELF::Notifier.new(@args[:hostname], @args[:port], @args[:max_chunk_size])
-      notifier.notify!(
-        :short_message => err.message,
+      notifier = GELF::Notifier.new(@args.delete(:hostname), @args.delete(:port), @args.delete(:max_chunk_size))
+      notifier.notify!({
+				:short_message => err.message,
         :full_message => err.backtrace.join("\n"),
-        :facility => @args[:facility],
-        :level => @args[:level],
-        :host => @args[:local_app_name],
+        :facility => @args.delete(:facility),
+        :level => @args.delete(:level),
+        :host => @args.delete(:local_app_name),
         :file => err.backtrace[0].split(":")[0],
-        :line => err.backtrace[0].split(":")[1]
-      )
+        :line => err.backtrace[0].split(":")[1],
+			}.merge(@args))
     rescue => i_err
       puts "Graylog2 Exception logger. Could not send message: " + i_err.message
     end

data/test/test_graylog2_exceptions.rb

@@ -23,6 +23,13 @@ class TestGraylog2Exceptions < Test::Unit::TestCase
     assert_equal 1, c.args[:level]
   end
   
+  def test_add_custom_attributes_to_parameters
+    c = Graylog2Exceptions.new(nil, {:_app => "my_awesome_app", :_rails_env => "staging"})
+    
+		assert_equal "my_awesome_app", c.args[:_app]
+		assert_equal "staging", c.args[:_rails_env]
+  end
+
   def test_correct_parameters_when_not_custom_set
     c = Graylog2Exceptions.new(nil, {})
     
@@ -64,6 +71,27 @@ class TestGraylog2Exceptions < Test::Unit::TestCase
     assert_equal ex.backtrace[0].split(":")[0], json["file"]
   end
 
+  def test_send_exception_to_graylog2_with_custom_attributes
+    ex = build_exception
+
+    c = Graylog2Exceptions.new(nil, {
+			:local_app_name => "machinexx", :level => 4, :facility => 'myfacility',
+			:_app => "my_awesome_app", :_rails_env => "staging"
+		})
+    sent = Zlib::Inflate.inflate(c.send_to_graylog2(ex).join)
+    json = JSON.parse(sent)
+
+    assert json["short_message"].include?('undefined method `klopfer!')
+    assert json["full_message"].include?('in `build_exception')
+    assert_equal 'myfacility', json["facility"]
+    assert_equal 3, json["level"]
+    assert_equal "machinexx", json["host"]
+    assert_equal ex.backtrace[0].split(":")[1], json["line"]
+    assert_equal ex.backtrace[0].split(":")[0], json["file"]
+    assert_equal 'my_awesome_app', json["_app"]
+    assert_equal 'staging', json["_rails_env"]
+  end
+
   def test_invalid_port_detection
     ex = build_exception
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
+  - 3
   - 0
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Lennart Koopmann
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +01:00
+date: 2011-03-15 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency