friendlyfashion-graylog2_exceptions 1.3.1 → 1.3.2

data/graylog2_exceptions.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{friendlyfashion-graylog2_exceptions}
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors       = ["Laurynas Butkus", "Tomas Didziokas", "Justas Janauskas", "Edvinas Bartkus"]

data/lib/graylog2_exceptions.rb

@@ -62,22 +62,33 @@ class Graylog2Exceptions
       }
 
       if err.backtrace && err.backtrace.size > 0
-        opts[:full_message] = "Backtrace:\n" + err.backtrace.join("\n")
+        opts[:full_message] = "-------------------------------\n"
+        opts[:full_message] << "Backtrace:\n"
+        opts[:full_message] << "-------------------------------\n\n"
+        opts[:full_message] << err.backtrace.join("\n")
+        opts[:full_message] << "\n"
+
         opts[:file] = err.backtrace[0].split(":")[0]
         opts[:line] = err.backtrace[0].split(":")[1]
       end
 
       if env and env.size > 0
         opts[:full_message] ||= ""
-        opts[:full_message] << "\n\nEnvironment:\n"
+        opts[:full_message] << "-------------------------------\n"
+        opts[:full_message] << "Environment:\n"
+        opts[:full_message] << "-------------------------------\n\n"
 
         env.each do |k, v|
           begin
-            opts[:full_message] << "#{k}: #{v}\n"
+            opts[:full_message] << " * #{k}: #{v}\n"
             #opts[:full_message] << "#{k}: #{v.inspect}\n"
           rescue
           end
         end
+
+        opts[:full_message] << "\n"
+        opts[:full_message] << " * Process: #{$$}\n"
+        opts[:full_message] << " * Server: #{`hostname`.chomp}\n"
       end
       
       notifier.notify!(opts.merge(@extra_args))

data/test/test_graylog2_exceptions.rb

@@ -137,15 +137,25 @@ class TestGraylog2Exceptions < Test::Unit::TestCase
     
     sent = Zlib::Inflate.inflate(c.send_to_graylog2(ex, data).join)
     json = JSON.parse(sent)
-    assert_equal('nil', json["_env_nil"])
-    assert_equal('"bar"', json["_env_str"])
-    assert_equal('123', json["_env_int"])
-    assert_equal('["a", 2]', json["_env_arr"])
-    assert_equal('{"a"=>1}', json["_env_hash"])
-    assert_match(/#<Object:.*>/, json["_env_obj"])
+
+    assert json["full_message"].include?('123')
+    assert json["full_message"].include?('bad')
+
     assert ! json.has_key?("_env_bad")
   end
 
+  def test_send_pid_to_graylog
+    ex = build_exception
+
+    c = Graylog2Exceptions.new(nil)
+    env = { 'test' => 1 }
+    sent = Zlib::Inflate.inflate(c.send_to_graylog2(ex, env).join)
+    json = JSON.parse(sent)
+
+    assert json["full_message"].include?("Process: #{$$}")
+    assert json["full_message"].include?("Server: #{`hostname`.chomp}")
+  end
+
   def test_invalid_port_detection
     ex = build_exception
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: friendlyfashion-graylog2_exceptions
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors: