gelf 1.1.0.beta3 → 1.1.0.beta4

data/CHANGELOG

@@ -1,6 +1,9 @@
-1.1.0 (not yet released), 2010-11-xx:
+1.1.0 (not yet released), 2010-12-xx:
+ + compatibility with GELF specification 1.0:
+   * requires graylog2-server version 0.9.XXXXXXXXXXXX or graylog2-server-twisted;
  + Notifier#default_options;
  + severity (level) threshold;
+ + automatically set 'file' and 'line' fields;
  + wrappers for GELF::Notifier#notify with severity:
    + GELF::Notifier.debug
    + GELF::Notifier.info
@@ -16,6 +19,10 @@
    + GELF::Logger#close
    + GELF::Logger#level = GELF::INFO
 
+1.0.2, 2010-11-29:
+1.0.1, 2010-11-29:
+ - added more tests for chunking in attempt to locate not existing bug.
+
 1.0.0, 2010-11-10:
  + initial stable version;
  * deprecated Gelf class is still there.

data/Rakefile

@@ -6,11 +6,11 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "gelf"
-    gem.summary = 'Library to send GELF messages to Graylog2 logging server'
-    gem.description = 'Suports plain-text, GELF messages and exceptions.'
-    gem.email = "lennart@socketfeed.com"
+    gem.summary = 'Library to send GELF messages to Graylog2 logging server.'
+    gem.description = 'Library to send GELF messages to Graylog2 logging server. Supports plain-text, GELF messages and exceptions.'
+    gem.email = "aleksey.palazhchenko@gmail.com"
     gem.homepage = "http://github.com/Graylog2/gelf-rb"
-    gem.authors = ["Alexey Palazhchenko", "Lennart Koopmann"]
+    gem.authors = ["Aleksey Palazhchenko", "Lennart Koopmann"]
     gem.add_dependency "json"
     gem.add_development_dependency "shoulda"
     gem.add_development_dependency "mocha"

data/VERSION

@@ -1 +1 @@
-1.1.0.beta3
+1.1.0.beta4

data/benchmarks/notifier.rb

@@ -1,15 +1,17 @@
 #! /usr/bin/env ruby
 
-require 'benchmark'
+puts "Loading..."
 
+require 'benchmark'
 require 'rubygems'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'gelf'
 
+puts "Generating random data..."
 srand(1)
 RANDOM_DATA = ('A'..'z').to_a
-k1_message = (0..1024).map { RANDOM_DATA[rand(RANDOM_DATA.count)] }.join
+k3_message = (1..3*1024).map { RANDOM_DATA[rand(RANDOM_DATA.count)] }.join
 
 TARGET_HOST = 'localhost'
 TARGET_PORT = 12201
@@ -17,16 +19,21 @@ DEFAULT_OPTIONS = { 'host' => 'localhost' }
 TIMES = 5000
 
 SHORT_HASH = { 'short_message' => 'message' }
-LONG_HASH = { 'short_message' => 'short message', 'long_message' => k1_message, 'user_id' => rand(10000)}
+LONG_HASH  = { 'short_message' => 'message', 'long_message' => k3_message }
 
 
 notifier_lan = GELF::Notifier.new(TARGET_HOST, TARGET_PORT, 'LAN', DEFAULT_OPTIONS)
 notifier_wan = GELF::Notifier.new(TARGET_HOST, TARGET_PORT, 'WAN', DEFAULT_OPTIONS)
 
-puts "Sending #{TIMES} notifications..."
-tms = Benchmark.bmbm do |b|
-  b.report('lan, short data') { TIMES.times { notifier_lan.notify!(SHORT_HASH) } }
-  b.report('wan, short data') { TIMES.times { notifier_wan.notify!(SHORT_HASH) } }
-  b.report('lan,  long data') { TIMES.times { notifier_lan.notify!(LONG_HASH) } }
-  b.report('wan,  long data') { TIMES.times { notifier_wan.notify!(LONG_HASH) } }
+# to create mongo collections, etc.
+notifier_lan.notify!(LONG_HASH)
+sleep(5)
+
+puts "Sending #{TIMES} notifications...\n"
+tms = Benchmark.bm(25) do |b|
+  b.report('lan, short data, 1 chunk ') { TIMES.times { notifier_lan.notify!(SHORT_HASH) } }
+  sleep(5)
+  b.report('lan,  long data, 1 chunk ') { TIMES.times { notifier_lan.notify!(LONG_HASH) } }
+  sleep(5)
+  b.report('wan,  long data, 2 chunks') { TIMES.times { notifier_wan.notify!(LONG_HASH) } }
 end

data/gelf.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gelf}
-  s.version = "1.1.0.beta3"
+  s.version = "1.1.0.beta4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Alexey Palazhchenko", "Lennart Koopmann"]
-  s.date = %q{2010-11-26}
-  s.description = %q{Suports plain-text, GELF messages and exceptions.}
-  s.email = %q{lennart@socketfeed.com}
+  s.authors = ["Aleksey Palazhchenko", "Lennart Koopmann"]
+  s.date = %q{2010-12-02}
+  s.description = %q{Library to send GELF messages to Graylog2 logging server. Supports plain-text, GELF messages and exceptions.}
+  s.email = %q{aleksey.palazhchenko@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Library to send GELF messages to Graylog2 logging server}
+  s.summary = %q{Library to send GELF messages to Graylog2 logging server.}
   s.test_files = [
     "test/helper.rb",
      "test/test_deprecations.rb",

data/lib/gelf/deprecations.rb

@@ -8,7 +8,7 @@ class Gelf
   attr_reader :notifier, :message
 
   def initialize(hostname, port)
-    deprecate('GELF::Notifier.new(hostname, port) and GELF::Message.new')
+    deprecate('GELF::Notifier.new(hostname, port)')
     @notifier = GELF::Notifier.new(hostname, port)
     @message = {}
   end

data/lib/gelf/logger.rb

@@ -20,7 +20,7 @@ module GELF
                             [args[0], nil]
                           end
 
-      hash = {'short_message' => message, 'facility' => facility}
+      hash = {'gelf_short_message' => message, 'gelf_facility' => facility}
       hash.merge!(self.class.extract_hash_from_exception(message)) if message.is_a?(Exception)
       notify_with_level(level, hash)
     end
@@ -39,7 +39,7 @@ module GELF
     end
 
     def <<(message)
-      notify('short_message' => message, 'level' => GELF::UNKNOWN)
+      notify('gelf_short_message' => message, 'gelf_level' => GELF::UNKNOWN)
     end
   end
 

data/lib/gelf/notifier.rb

@@ -21,9 +21,10 @@ module GELF
 
       @default_options = {}
       self.default_options = default_options
-      self.default_options['host'] ||= Socket.gethostname
-      self.default_options['level'] ||= GELF::DEBUG
-      self.default_options['facility'] ||= 'gelf-rb'
+      self.default_options['gelf_version'] = SPEC_VERSION
+      self.default_options['gelf_host'] ||= Socket.gethostname
+      self.default_options['gelf_level'] ||= GELF::DEBUG
+      self.default_options['gelf_facility'] ||= 'gelf-rb'
 
       @sender = RubySender.new(host, port)
     end
@@ -95,8 +96,8 @@ module GELF
     def notify_with_level!(message_level, *args)
       return unless @enabled
       extract_hash(*args)
-      @hash['level'] = message_level unless message_level.nil?
-      if @hash['level'] >= level
+      @hash['gelf_level'] = message_level unless message_level.nil?
+      if @hash['gelf_level'] >= level
         @sender.send_datagrams(datagrams_from_hash)
       end
     end
@@ -105,40 +106,53 @@ module GELF
       primary_data = if object.respond_to?(:to_hash)
                        object.to_hash
                      elsif object.is_a?(Exception)
-                       args['level'] ||= GELF::ERROR
+                       args['gelf_level'] ||= GELF::ERROR
                        self.class.extract_hash_from_exception(object)
                      else
-                       args['level'] ||= GELF::INFO
-                       { 'short_message' => object.to_s }
+                       args['gelf_level'] ||= GELF::INFO
+                       { 'gelf_short_message' => object.to_s }
                      end
 
       @hash = default_options.merge(args.merge(primary_data))
       stringify_hash_keys
       convert_hoptoad_keys_to_graylog2
+      set_file_and_line
       check_presence_of_mandatory_attributes
       @hash
     end
 
     def self.extract_hash_from_exception(exception)
       bt = exception.backtrace || ["Backtrace is not available."]
-      { 'short_message' => "#{exception.class}: #{exception.message}", 'full_message' => "Backtrace:\n" + bt.join("\n") }
+      { 'gelf_short_message' => "#{exception.class}: #{exception.message}", 'gelf_full_message' => "Backtrace:\n" + bt.join("\n") }
     end
 
     # Converts Hoptoad-specific keys in +@hash+ to Graylog2-specific.
     def convert_hoptoad_keys_to_graylog2
-      if @hash['short_message'].to_s.empty?
+      if @hash['gelf_short_message'].to_s.empty?
         if @hash.has_key?('error_class') && @hash.has_key?('error_message')
-          @hash['short_message'] = "#{@hash['error_class']}: #{@hash['error_message']}"
+          @hash['gelf_short_message'] = "#{@hash['error_class']}: #{@hash['error_message']}"
           @hash.delete('error_class')
           @hash.delete('error_message')
         end
       end
     end
 
+    CALLER_REGEXP = /^(.*):(\d+):.*/
+
+    def set_file_and_line
+      stack = caller
+      begin
+        frame = stack.shift
+      end while frame.include?(__FILE__)
+      match = CALLER_REGEXP.match(frame)
+      @hash['gelf_file'] = match[1]
+      @hash['gelf_line'] = match[2].to_i
+    end
+
     def check_presence_of_mandatory_attributes
-      %w(short_message host).each do |attribute|
+      %w(gelf_version gelf_short_message gelf_host).each do |attribute|
         if @hash[attribute].to_s.empty?
-          raise ArgumentError.new("Options short_message and host must be set.")
+          raise ArgumentError.new("#{attribute} is missing. Options gelf_version, gelf_short_message and gelf_host must be set.")
         end
       end
     end
@@ -146,7 +160,7 @@ module GELF
     def datagrams_from_hash
       raise ArgumentError.new("Hash is empty.") if @hash.nil? || @hash.empty?
 
-      @hash['level'] = GELF::LEVELS_MAPPING[@hash['level']]
+      @hash['gelf_level'] = GELF::LEVELS_MAPPING[@hash['gelf_level']]
 
       data = Zlib::Deflate.deflate(@hash.to_json).bytes
       datagrams = []
@@ -168,8 +182,7 @@ module GELF
     end
 
     def self.chunk_data(data, msg_id, num, count)
-      # [30, 15].pack('CC') => "\036\017"
-      return "\036\017" + msg_id + [num, count].pack('nn') + data.map(&:chr).join
+      return "\x1e\x0f" + msg_id + [num, count, *data].pack('nnC*')
     end
 
     def stringify_hash_keys

data/lib/gelf.rb

@@ -3,6 +3,10 @@ require 'socket'
 require 'zlib'
 require 'digest/sha2'
 
+module GELF
+  SPEC_VERSION = '1.0'
+end
+
 require 'gelf/severity'
 require 'gelf/ruby_sender'
 require 'gelf/notifier'

data/test/test_logger.rb

@@ -18,7 +18,7 @@ class TestLogger < Test::Unit::TestCase
       should "implement add method with level and message from parameters" do
         @notifier.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
-          hash['short_message'] == 'Message'
+          hash['gelf_short_message'] == 'Message'
         end
         @notifier.add(GELF::INFO, 'Message')
       end
@@ -27,8 +27,8 @@ class TestLogger < Test::Unit::TestCase
       should "implement add method with level and exception from parameters" do
         @notifier.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
-          hash['short_message'] == 'RuntimeError: Boom!' &&
-          hash['full_message'] =~ /^Backtrace/
+          hash['gelf_short_message'] == 'RuntimeError: Boom!' &&
+          hash['gelf_full_message'] =~ /^Backtrace/
         end
         @notifier.add(GELF::INFO, RuntimeError.new('Boom!'))
       end
@@ -37,7 +37,7 @@ class TestLogger < Test::Unit::TestCase
       should "implement add method with level from parameter and message from block" do
         @notifier.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
-          hash['short_message'] == 'Message'
+          hash['gelf_short_message'] == 'Message'
         end
         @notifier.add(GELF::INFO) { 'Message' }
       end
@@ -46,8 +46,8 @@ class TestLogger < Test::Unit::TestCase
       should "implement add method with level from parameter and exception from block" do
         @notifier.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
-          hash['short_message'] == 'RuntimeError: Boom!' &&
-          hash['full_message'] =~ /^Backtrace/
+          hash['gelf_short_message'] == 'RuntimeError: Boom!' &&
+          hash['gelf_full_message'] =~ /^Backtrace/
         end
         @notifier.add(GELF::INFO) { RuntimeError.new('Boom!') }
       end
@@ -56,8 +56,8 @@ class TestLogger < Test::Unit::TestCase
       should "implement add method with level, message and facility from parameters" do
         @notifier.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
-          hash['short_message'] == 'Message' &&
-          hash['facility'] == 'Facility'
+          hash['gelf_short_message'] == 'Message' &&
+          hash['gelf_facility'] == 'Facility'
         end
         @notifier.add(GELF::INFO, 'Message', 'Facility')
       end
@@ -66,9 +66,9 @@ class TestLogger < Test::Unit::TestCase
       should "implement add method with level, exception and facility from parameters" do
         @notifier.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
-          hash['short_message'] == 'RuntimeError: Boom!' &&
-          hash['full_message'] =~ /^Backtrace/ &&
-          hash['facility'] == 'Facility'
+          hash['gelf_short_message'] == 'RuntimeError: Boom!' &&
+          hash['gelf_full_message'] =~ /^Backtrace/ &&
+          hash['gelf_facility'] == 'Facility'
         end
         @notifier.add(GELF::INFO, RuntimeError.new('Boom!'), 'Facility')
       end
@@ -77,8 +77,8 @@ class TestLogger < Test::Unit::TestCase
       should "implement add method with level and facility from parameters and message from block" do
         @notifier.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
-          hash['short_message'] == 'Message' &&
-          hash['facility'] == 'Facility'
+          hash['gelf_short_message'] == 'Message' &&
+          hash['gelf_facility'] == 'Facility'
         end
         @notifier.add(GELF::INFO, 'Facility') { 'Message' }
       end
@@ -87,9 +87,9 @@ class TestLogger < Test::Unit::TestCase
       should "implement add method with level and facility from parameters and exception from block" do
         @notifier.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
-          hash['short_message'] == 'RuntimeError: Boom!' &&
-          hash['full_message'] =~ /^Backtrace/ &&
-          hash['facility'] == 'Facility'
+          hash['gelf_short_message'] == 'RuntimeError: Boom!' &&
+          hash['gelf_full_message'] =~ /^Backtrace/ &&
+          hash['gelf_facility'] == 'Facility'
         end
         @notifier.add(GELF::INFO, 'Facility') { RuntimeError.new('Boom!') }
       end
@@ -126,8 +126,8 @@ class TestLogger < Test::Unit::TestCase
 
     should "support Notifier#<<" do
       @notifier.expects(:notify_with_level!).with do |nil_, hash|
-        hash['short_message'] == "Message" &&
-        hash['level'] == GELF::UNKNOWN
+        hash['gelf_short_message'] == "Message" &&
+        hash['gelf_level'] == GELF::UNKNOWN
       end
       @notifier << "Message"
     end

data/test/test_notifier.rb

@@ -1,6 +1,10 @@
 require 'helper'
 
-HASH = {'short_message' => 'message', 'host' => 'somehost', 'level' => GELF::WARN, 'facility' => 'test'}
+HASH = { 'gelf_version' => '1.0',
+         'gelf_short_message' => 'message',
+         'gelf_host' => 'somehost',
+         'gelf_level' => GELF::WARN,
+         'gelf_facility' => 'test' }
 
 RANDOM_DATA = ('A'..'Z').to_a
 
@@ -9,10 +13,12 @@ class TestNotifier < Test::Unit::TestCase
     Socket.expects(:gethostname).returns('default_hostname')
     n = GELF::Notifier.new
     assert_equal ['localhost', 12201, 1420], [n.host, n.port, n.max_chunk_size]
-    assert_equal({'level' => 0, 'host' => 'default_hostname', 'facility' => 'gelf-rb'}, n.default_options)
-    n.host, n.port, n.max_chunk_size, n.default_options = 'graylog2.org', 7777, :lan, {'host' => 'grayhost'}
+    assert_equal( { 'gelf_version' => '1.0', 'gelf_level' => GELF::DEBUG,
+                    'gelf_host' => 'default_hostname', 'gelf_facility' => 'gelf-rb' },
+                  n.default_options )
+    n.host, n.port, n.max_chunk_size, n.default_options = 'graylog2.org', 7777, :lan, {'gelf_host' => 'grayhost'}
     assert_equal ['graylog2.org', 7777, 8154], [n.host, n.port, n.max_chunk_size]
-    assert_equal({'host' => 'grayhost'}, n.default_options)
+    assert_equal({'gelf_host' => 'grayhost'}, n.default_options)
 
     n.max_chunk_size = 1337.1
     assert_equal 1337, n.max_chunk_size
@@ -33,71 +39,84 @@ class TestNotifier < Test::Unit::TestCase
       end
 
       should "work with hash" do
-        assert_equal HASH, @notifier.__send__(:extract_hash, HASH)
+        hash = @notifier.__send__(:extract_hash, HASH)
+        hash.delete('gelf_file')
+        hash.delete('gelf_line')
+        assert_equal HASH, hash
       end
 
       should "work with any object which responds to #to_hash" do
         o = Object.new
         o.expects(:to_hash).returns(HASH)
-        assert_equal HASH, @notifier.__send__(:extract_hash, o)
+        hash = @notifier.__send__(:extract_hash, o)
+        hash.delete('gelf_file')
+        hash.delete('gelf_line')
+        assert_equal HASH, hash
       end
 
       should "work with exception with backtrace" do
         e = RuntimeError.new('message')
         e.set_backtrace(caller)
         hash = @notifier.__send__(:extract_hash, e)
-        assert_equal 'RuntimeError: message', hash['short_message']
-        assert_match /Backtrace/, hash['full_message']
-        assert_equal GELF::ERROR, hash['level']
+        assert_equal 'RuntimeError: message', hash['gelf_short_message']
+        assert_match /Backtrace/, hash['gelf_full_message']
+        assert_equal GELF::ERROR, hash['gelf_level']
       end
 
       should "work with exception without backtrace" do
         e = RuntimeError.new('message')
         hash = @notifier.__send__(:extract_hash, e)
-        assert_match /Backtrace is not available/, hash['full_message']
+        assert_match /Backtrace is not available/, hash['gelf_full_message']
       end
 
       should "work with exception and hash" do
-        e, h = RuntimeError.new('message'), {'param' => 1, 'level' => GELF::FATAL, 'short_message' => 'will be hidden by exception'}
+        e, h = RuntimeError.new('message'), {'param' => 1, 'gelf_level' => GELF::FATAL, 'gelf_short_message' => 'will be hidden by exception'}
         hash = @notifier.__send__(:extract_hash, e, h)
-        assert_equal 'RuntimeError: message', hash['short_message']
-        assert_equal GELF::FATAL, hash['level']
+        assert_equal 'RuntimeError: message', hash['gelf_short_message']
+        assert_equal GELF::FATAL, hash['gelf_level']
         assert_equal 1, hash['param']
       end
 
       should "work with plain text" do
         hash = @notifier.__send__(:extract_hash, 'message')
-        assert_equal 'message', hash['short_message']
-        assert_equal GELF::INFO, hash['level']
+        assert_equal 'message', hash['gelf_short_message']
+        assert_equal GELF::INFO, hash['gelf_level']
       end
 
       should "work with plain text and hash" do
-        hash = @notifier.__send__(:extract_hash, 'message', 'level' => GELF::WARN)
-        assert_equal 'message', hash['short_message']
-        assert_equal GELF::WARN, hash['level']
+        hash = @notifier.__send__(:extract_hash, 'message', 'gelf_level' => GELF::WARN)
+        assert_equal 'message', hash['gelf_short_message']
+        assert_equal GELF::WARN, hash['gelf_level']
       end
 
       should "covert hash keys to strings" do
-        hash = @notifier.__send__(:extract_hash, :short_message => :message)
-        assert hash.has_key?('short_message')
-        assert !hash.has_key?(:short_message)
+        hash = @notifier.__send__(:extract_hash, :gelf_short_message => :message)
+        assert hash.has_key?('gelf_short_message')
+        assert !hash.has_key?(:gelf_short_message)
       end
 
       should "not overwrite keys on convert" do
-        assert_raise(ArgumentError) { @notifier.__send__(:extract_hash, :short_message => :message1, 'short_message' => 'message2') }
+        assert_raise(ArgumentError) { @notifier.__send__(:extract_hash, :gelf_short_message => :message1, 'gelf_short_message' => 'message2') }
       end
 
       should "use default_options" do
-        @notifier.default_options = {:file => 'somefile.rb', 'short_message' => 'will be hidden by explicit argument'}
+        @notifier.default_options = {:foo => 'bar', 'gelf_short_message' => 'will be hidden by explicit argument'}
         hash = @notifier.__send__(:extract_hash, HASH)
-        assert_equal 'somefile.rb', hash['file']
-        assert_not_equal 'will be hidden by explicit argument', hash['short_message']
+        assert_equal 'bar', hash['foo']
+        assert_not_equal 'will be hidden by explicit argument', hash['gelf_short_message']
       end
 
       should "be compatible with HoptoadNotifier" do
         # https://github.com/thoughtbot/hoptoad_notifier/blob/master/README.rdoc, section Going beyond exceptions
         hash = @notifier.__send__(:extract_hash, :error_class => 'Class', :error_message => 'Message')
-        assert_equal 'Class: Message', hash['short_message']
+        assert_equal 'Class: Message', hash['gelf_short_message']
+      end
+
+      should "set file and line" do
+        line = __LINE__
+        hash = @notifier.__send__(:extract_hash, HASH)
+        assert_match /test_notifier.rb/, hash['gelf_file']
+        assert_equal line + 1, hash['gelf_line']
       end
     end
 
@@ -106,7 +125,7 @@ class TestNotifier < Test::Unit::TestCase
         @notifier.instance_variable_set('@hash', HASH)
         datagrams = @notifier.__send__(:datagrams_from_hash)
         assert_equal 1, datagrams.count
-        assert_equal "\170\234", datagrams[0][0..1]
+        assert_equal "\x78\x9c", datagrams[0][0..1] # zlib header
       end
 
       should "split long data" do
@@ -115,8 +134,15 @@ class TestNotifier < Test::Unit::TestCase
         @notifier.instance_variable_set('@hash', hash)
         datagrams = @notifier.__send__(:datagrams_from_hash)
         assert_equal 2, datagrams.count
-        assert_equal "\036\017", datagrams[0][0..1]
-        assert_equal "\036\017", datagrams[1][0..1]
+        datagrams.each_index do |i|
+          datagram = datagrams[i]
+          assert datagram[0..1] == "\x1e\x0f" # chunked GELF magic number
+          # datagram[2..33] is a message id
+          assert_equal 0, datagram[34].ord
+          assert_equal i, datagram[35].ord
+          assert_equal 0, datagram[36].ord
+          assert_equal datagrams.count, datagram[37].ord
+        end
       end
     end
 
@@ -134,12 +160,12 @@ class TestNotifier < Test::Unit::TestCase
 
       should "not send notifications with level below threshold" do
         @sender.expects(:send_datagrams).never
-        @notifier.notify!(HASH.merge('level' => GELF::DEBUG))
+        @notifier.notify!(HASH.merge('gelf_level' => GELF::DEBUG))
       end
 
       should "not notifications with level equal or above threshold" do
         @sender.expects(:send_datagrams).once
-        @notifier.notify!(HASH.merge('level' => GELF::WARN))
+        @notifier.notify!(HASH.merge('gelf_level' => GELF::WARN))
       end
     end
 

metadata

@@ -1,23 +1,23 @@
 --- !ruby/object:Gem::Specification 
 name: gelf
 version: !ruby/object:Gem::Version 
-  hash: -1848230061
+  hash: -1848230064
   prerelease: true
   segments: 
   - 1
   - 1
   - 0
-  - beta3
-  version: 1.1.0.beta3
+  - beta4
+  version: 1.1.0.beta4
 platform: ruby
 authors: 
-- Alexey Palazhchenko
+- Aleksey Palazhchenko
 - Lennart Koopmann
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +03:00
+date: 2010-12-02 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,8 +62,8 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id003
-description: Suports plain-text, GELF messages and exceptions.
-email: lennart@socketfeed.com
+description: Library to send GELF messages to Graylog2 logging server. Supports plain-text, GELF messages and exceptions.
+email: aleksey.palazhchenko@gmail.com
 executables: []
 
 extensions: []
@@ -128,7 +128,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Library to send GELF messages to Graylog2 logging server
+summary: Library to send GELF messages to Graylog2 logging server.
 test_files: 
 - test/helper.rb
 - test/test_deprecations.rb