gelf 1.1.3 → 1.2.0.beta1

data/CHANGELOG

@@ -1,10 +1,9 @@
-1.1.0 (not yet released), 2010-12-xx:
+1.2.0, 2010-0x-yy:
  + compatibility with GELF specification 1.0:
-   * requires graylog2-server version after 0.9.XXXXXXXXXXXX or graylog2-server-twisted;
-   * requires graylog2-web-interface version XXXXXXXXXXXX;
- + Notifier#default_options;
+   * requires modern graylog2-server and graylog2-web-interface;
+ + Notifier#default_options, Notifier#default_options=;
  + severity (level) threshold;
- + automatically set '_file', '_line' and '_timestamp' fields;
+ + automatically set 'file', 'line' and 'timestamp' fields;
  + wrappers for GELF::Notifier#notify with severity:
    + GELF::Notifier.debug
    + GELF::Notifier.info
@@ -19,6 +18,11 @@
    + GELF::Logger#add(GELF::FATAL) { 'Fatal error!' }
    + GELF::Logger#close
    + GELF::Logger#level = GELF::INFO
+ + allow to change severity mapping;
+ + send messages to receivers in round-robin;
+   * GELF::Notifier#host and #port are attr_readers now and deprecated (were attr_accessor);
+ + allow to disable file and line collection (GELF::Notifier#collect_file_and_line = false);
+ - deprecated Gelf class removed.
 
 1.0.2, 2010-11-29:
 1.0.1, 2010-11-29:

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Lennart Koopmann, Aleksey Palazhchenko
+Copyright (c) 2010 Lennart Koopmann, Alexey Palazhchenko
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,6 +1,6 @@
 = GELF
 
-This is the new GELF gem written by Aleksey Palazhchenko. It is based on the old gem by Lennart Koopmann and allows you to send GELF
+This is the new GELF gem written by Alexey Palazhchenko. It is based on the old gem by Lennart Koopmann and allows you to send GELF
 messages to Graylog2 server instances. See http://www.graylog2.org/about/gelf for more information about GELF and
 http://www.graylog2.org/documentation/libraries for usage examples.
 
@@ -17,4 +17,4 @@ Works with Ruby 1.8.7 and 1.9.2. 1.8.6 is not supported.
 
 == Copyright
 
-Copyright (c) 2010 Lennart Koopmann and Aleksey Palazhchenko. See LICENSE for details.
+Copyright (c) 2010 Lennart Koopmann and Alexey Palazhchenko. See LICENSE for details.

data/Rakefile

@@ -1,24 +1,29 @@
-require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.4.0' # https://github.com/technicalpickles/jeweler/issues/issue/150
+  require 'ci/reporter/rake/test_unit'
+rescue LoadError
+  # nothing
+end
+
+begin
   require 'jeweler'
+
   Jeweler::Tasks.new do |gem|
     gem.name = "gelf"
     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.email = "alexey.palazhchenko@gmail.com"
     gem.homepage = "http://github.com/Graylog2/gelf-rb"
-    gem.authors = ["Aleksey Palazhchenko", "Lennart Koopmann"]
+    gem.authors = ["Alexey Palazhchenko", "Lennart Koopmann"]
     gem.add_dependency "json"
     gem.add_development_dependency "shoulda"
     gem.add_development_dependency "mocha"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+rescue LoadError => e
+  puts e
+  abort "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
 require 'rake/testtask'
@@ -28,6 +33,9 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
+task :test => :check_dependencies
+task :default => :test
+
 begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
@@ -36,20 +44,47 @@ begin
     test.rcov_opts << '--exclude gem'
     test.verbose = true
   end
-rescue LoadError
+rescue LoadError => e
   task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: gem install rcov"
+    puts e
+    abort "rcov is not available. Run: gem install rcov"
   end
 end
 
 begin
+  gem 'ruby_parser', '~> 2.0.6'
+  gem 'activesupport', '~> 3.0.0'
+  gem 'metric_fu', '~> 2.1.1'
   require 'metric_fu'
-rescue LoadError
-end
 
-task :test => :check_dependencies
+  MetricFu::Configuration.run do |config|
+    # Saikuro is useless
+    config.metrics -= [:saikuro]
 
-task :default => :test
+    config.flay     = { :dirs_to_flay  => ['lib'],
+                        :minimum_score => 10  }
+    config.flog     = { :dirs_to_flog  => ['lib'] }
+    config.reek     = { :dirs_to_reek  => ['lib'] }
+    config.roodi    = { :dirs_to_roodi => ['lib'] }
+    config.rcov     = { :environment => 'test',
+                        :test_files => ['test/test_*.rb'],
+                        :rcov_opts => ["-I 'lib:test'",
+                                       "--sort coverage",
+                                       "--no-html",
+                                       "--text-coverage",
+                                       "--no-color",
+                                       "--exclude /test/,/gems/"]}
+    config.graph_engine = :gchart
+  end
+
+rescue LoadError, NameError => e
+  desc 'Generate all metrics reports'
+  task :'metrics:all' do
+    puts e.inspect
+    # puts e.backtrace
+    abort "metric_fu is not available. Run: gem install metric_fu"
+  end
+end
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.2.0.beta1

data/benchmarks/notifier.rb

@@ -18,8 +18,8 @@ TARGET_PORT = 12201
 DEFAULT_OPTIONS = { '_host' => 'localhost' }
 TIMES = 5000
 
-SHORT_HASH = { '_short_message' => 'message' }
-LONG_HASH  = { '_short_message' => 'message', '_long_message' => k3_message }
+SHORT_HASH = { 'short_message' => 'message' }
+LONG_HASH  = { 'short_message' => 'message', 'long_message' => k3_message }
 
 
 notifier_lan = GELF::Notifier.new(TARGET_HOST, TARGET_PORT, 'LAN', DEFAULT_OPTIONS)

data/gelf.gemspec

@@ -1,60 +1,46 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{gelf}
-  s.version = "1.1.3"
+  s.version = "1.2.0.beta1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aleksey Palazhchenko", "Lennart Koopmann"]
-  s.date = %q{2011-01-23}
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.authors = [%q{Alexey Palazhchenko}, %q{Lennart Koopmann}]
+  s.date = %q{2011-05-23}
   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.email = %q{alexey.palazhchenko@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "benchmarks/notifier.rb",
-     "gelf.gemspec",
-     "lib/gelf.rb",
-     "lib/gelf/deprecations.rb",
-     "lib/gelf/em_sender.rb",
-     "lib/gelf/logger.rb",
-     "lib/gelf/notifier.rb",
-     "lib/gelf/ruby_sender.rb",
-     "lib/gelf/severity.rb",
-     "test/helper.rb",
-     "test/test_deprecations.rb",
-     "test/test_logger.rb",
-     "test/test_notifier.rb",
-     "test/test_ruby_sender.rb",
-     "test/test_severity.rb"
+    "CHANGELOG",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "benchmarks/notifier.rb",
+    "gelf.gemspec",
+    "lib/gelf.rb",
+    "lib/gelf/logger.rb",
+    "lib/gelf/notifier.rb",
+    "lib/gelf/ruby_sender.rb",
+    "lib/gelf/severity.rb",
+    "test/helper.rb",
+    "test/test_logger.rb",
+    "test/test_notifier.rb",
+    "test/test_ruby_sender.rb",
+    "test/test_severity.rb"
   ]
   s.homepage = %q{http://github.com/Graylog2/gelf-rb}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.3}
   s.summary = %q{Library to send GELF messages to Graylog2 logging server.}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_logger.rb",
-     "test/test_notifier.rb",
-     "test/test_severity.rb",
-     "test/test_ruby_sender.rb",
-     "test/test_deprecations.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/gelf.rb

@@ -11,4 +11,3 @@ require 'gelf/severity'
 require 'gelf/ruby_sender'
 require 'gelf/notifier'
 require 'gelf/logger'
-require 'gelf/deprecations'

data/lib/gelf/logger.rb

@@ -5,22 +5,22 @@ module GELF
     def close
     end
 
-    # Use it like Logger#add… or better not to use at all.
+    # Use it like Logger#add... or better not to use at all.
     def add(level, *args)
       raise ArgumentError.new('Wrong arguments.') unless (0..2).include?(args.count)
 
       # Ruby Logger's author is a maniac.
-      message, facility = if args.count == 2
+      message, progname = if args.count == 2
                             [args[0], args[1]]
                           elsif args.count == 0
-                            [yield, nil]
+                            [yield, default_options['facility']]
                           elsif block_given?
                             [yield, args[0]]
                           else
-                            [args[0], nil]
+                            [args[0], default_options['facility']]
                           end
 
-      hash = {'short_message' => message, 'facility' => facility}
+      hash = {'short_message' => message, 'facility' => progname}
       hash.merge!(self.class.extract_hash_from_exception(message)) if message.is_a?(Exception)
       notify_with_level(level, hash)
     end
@@ -40,11 +40,14 @@ module GELF
     end
 
     def <<(message)
-      notify('short_message' => message, 'level' => GELF::UNKNOWN)
+      notify_with_level(GELF::UNKNOWN, 'short_message' => message)
     end
   end
 
   # Graylog2 notifier, compatible with Ruby Logger.
+  # You can use it with Rails like this:
+  #     config.logger = GELF::Logger.new("localhost", 12201, "WAN", { :facility => "appname" })
+  #     config.colorize_logging = false
   class Logger < Notifier
     include LoggerCompatibility
     @last_chunk_id = 0

data/lib/gelf/notifier.rb

@@ -6,18 +6,18 @@ module GELF
       attr_accessor :last_chunk_id
     end
 
-    attr_accessor :host, :port, :default_options, :enabled
-    attr_reader :max_chunk_size, :level
+    attr_accessor :enabled, :collect_file_and_line
+    attr_reader :max_chunk_size, :level, :default_options, :level_mapping
 
     # +host+ and +port+ are host/ip and port of graylog2-server.
     # +max_size+ is passed to max_chunk_size=.
     # +default_options+ is used in notify!
     def initialize(host = 'localhost', port = 12201, max_size = 'WAN', default_options = {})
       @enabled = true
+      @collect_file_and_line = true
 
       self.level = GELF::DEBUG
-
-      self.host, self.port, self.max_chunk_size = host, port, max_size
+      self.max_chunk_size = max_size
 
       self.default_options = default_options
       self.default_options['version'] = SPEC_VERSION
@@ -25,19 +25,42 @@ module GELF
       self.default_options['level'] ||= GELF::UNKNOWN
       self.default_options['facility'] ||= 'gelf-rb'
 
-      @sender = RubyUdpSender.new(host, port)
+      @sender = RubyUdpSender.new([[host, port]])
+      self.level_mapping = :logger
+    end
+
+    # Get a list of receivers.
+    #    notifier.addresses  # => [['localhost', 12201], ['localhost', 12202]]
+    def addresses
+      @sender.addresses
+    end
+
+    # Set a list of receivers.
+    #    notifier.addresses = [['localhost', 12201], ['localhost', 12202]]
+    def addresses=(addrs)
+      @sender.addresses = addrs
+    end
+
+    def host
+      warn "GELF::Notifier#host is deprecated. Use #addresses instead."
+      self.addresses.first[0]
+    end
+
+    def port
+      warn "GELF::Notifier#port is deprecated. Use #addresses instead."
+      self.addresses.first[1]
     end
 
     # +size+ may be a number of bytes, 'WAN' (1420 bytes) or 'LAN' (8154).
     # Default (safe) value is 'WAN'.
     def max_chunk_size=(size)
-      size_s = size.to_s.downcase
-      if size_s == 'wan'
-        @max_chunk_size = 1420
-      elsif size_s == 'lan'
-        @max_chunk_size = 8154
-      else
-        @max_chunk_size = size.to_int
+      case size.to_s.downcase
+        when 'wan'
+          @max_chunk_size = 1420
+        when 'lan'
+          @max_chunk_size = 8154
+        else
+          @max_chunk_size = size.to_int
       end
     end
 
@@ -49,6 +72,23 @@ module GELF
                end
     end
 
+    def default_options=(options)
+      @default_options = self.class.stringify_keys(options)
+    end
+
+    # +mapping+ may be a hash, 'logger' (GELF::LOGGER_MAPPING) or 'direct' (GELF::DIRECT_MAPPING).
+    # Default (compatible) value is 'logger'.
+    def level_mapping=(mapping)
+      case mapping.to_s.downcase
+        when 'logger'
+          @level_mapping = GELF::LOGGER_MAPPING
+        when 'direct'
+          @level_mapping = GELF::DIRECT_MAPPING
+        else
+          @level_mapping = mapping
+      end
+    end
+
     def disable
       @enabled = false
     end
@@ -72,6 +112,7 @@ module GELF
     # - string-like object (anything which responds to +to_s+) with optional hash-like object:
     #    notify!('Plain olde text message', :scribe => 'AlekSi')
     # Resulted fields are merged with +default_options+, the latter will never overwrite the former.
+    # This method will raise +ArgumentError+ if arguments are wrong. Consider using notify instead.
     def notify!(*args)
       notify_with_level!(nil, *args)
     end
@@ -111,10 +152,9 @@ module GELF
                        { 'short_message' => object.to_s }
                      end
 
-      @hash = default_options.merge(args.merge(primary_data))
-      stringify_hash_keys
+      @hash = default_options.merge(self.class.stringify_keys(args.merge(primary_data)))
       convert_hoptoad_keys_to_graylog2
-      set_file_and_line
+      set_file_and_line if @collect_file_and_line
       set_timestamp
       check_presence_of_mandatory_attributes
       @hash
@@ -143,8 +183,8 @@ module GELF
         frame = stack.shift
       end while frame.include?(LIB_GELF_PATTERN)
       match = CALLER_REGEXP.match(frame)
-      @hash['file'] = match[1] if @hash['file'] == nil
-      @hash['line'] = match[2].to_i if @hash['line'] == nil
+      @hash['file'] = match[1]
+      @hash['line'] = match[2].to_i
     end
 
     def set_timestamp
@@ -182,16 +222,18 @@ module GELF
     def serialize_hash
       raise ArgumentError.new("Hash is empty.") if @hash.nil? || @hash.empty?
 
-      @hash['level'] = GELF::LEVELS_MAPPING[@hash['level']]
+      @hash['level'] = @level_mapping[@hash['level']]
 
       Zlib::Deflate.deflate(@hash.to_json).bytes
     end
 
-    def stringify_hash_keys
-      @hash.keys.each do |key|
-        value, key_s = @hash.delete(key), key.to_s
-        @hash[key_s] = value
+    def self.stringify_keys(hash)
+      hash.keys.each do |key|
+        value, key_s = hash.delete(key), key.to_s
+        raise ArgumentError.new("Both #{key.inspect} and #{key_s} are present.") if hash.has_key?(key_s)
+        hash[key_s] = value
       end
+      hash
     end
   end
 end

data/lib/gelf/ruby_sender.rb

@@ -1,29 +1,20 @@
 module GELF
   # Plain Ruby UDP sender.
   class RubyUdpSender
-    def initialize(host, port)
-      @host, @port = host, port
+    attr_accessor :addresses
+
+    def initialize(addresses)
+      @addresses = addresses
+      @i = 0
       @socket = UDPSocket.open
     end
 
     def send_datagrams(datagrams)
+      host, port = @addresses[@i]
+      @i = (@i + 1) % @addresses.length
       datagrams.each do |datagram|
-        @socket.send(datagram, 0, @host, @port)
+        @socket.send(datagram, 0, host, port)
       end
     end
   end
-
-  # Plain Ruby TCP sender.
-  # class RubyTcpSender
-  #   def initialize(host, port)
-  #     @host, @port = host, port
-  #     @socket = TCPSocket.open
-  #   end
-  #
-  #   def send_datagrams(datagrams)
-  #     datagrams.each do |datagram|
-  #       @socket.send(datagram, 0, @host, @port)
-  #     end
-  #   end
-  # end
 end

data/lib/gelf/severity.rb

@@ -1,11 +1,11 @@
 module GELF
-  # There are two things you should know about log leves/severity:
+  # There are two things you should know about log levels/severity:
   #  - syslog defines levels from 0 (Emergency) to 7 (Debug).
   #    0 (Emergency) and 1 (Alert) levels are reserved for OS kernel.
   #  - Ruby default Logger defines levels from 0 (DEBUG) to 4 (FATAL) and 5 (UNKNOWN).
   #    Note that order is inverted.
   # For compatibility we define our constants as Ruby Logger, and convert values before
-  # generating GELF message.
+  # generating GELF message, using defined mapping.
 
   module Levels
     DEBUG   = 0
@@ -18,11 +18,20 @@ module GELF
 
   include Levels
 
-  # Maps Ruby Logger levels to syslog levels as SyslogLogger and syslogger gems.
-  LEVELS_MAPPING = {DEBUG   => 7, # Debug
+  # Maps Ruby Logger levels to syslog levels as SyslogLogger and syslogger gems. This one is default.
+  LOGGER_MAPPING = {DEBUG   => 7, # Debug
                     INFO    => 6, # Info
                     WARN    => 5, # Notice
                     ERROR   => 4, # Warning
                     FATAL   => 3, # Error
                     UNKNOWN => 1} # Alert – shouldn't be used
+
+  # Maps Ruby Logger levels to syslog levels as is.
+  DIRECT_MAPPING = {DEBUG   => 7, # Debug
+                    INFO    => 6, # Info
+                    # skip 5 Notice
+                    WARN    => 4, # Warning
+                    ERROR   => 3, # Error
+                    FATAL   => 2, # Critical
+                    UNKNOWN => 1} # Alert – shouldn't be used
 end

data/test/helper.rb

@@ -3,11 +3,6 @@ require 'test/unit'
 require 'shoulda'
 require 'mocha'
 
-begin
-  require 'ruby-debug'
-rescue LoadError
-end
-
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'gelf'

data/test/test_logger.rb

@@ -1,135 +1,139 @@
 require 'helper'
 
 class TestLogger < Test::Unit::TestCase
-  context "with notifier with mocked sender" do
+  context "with logger with mocked sender" do
     setup do
       Socket.stubs(:gethostname).returns('stubbed_hostname')
-      @notifier = GELF::Logger.new('host', 12345)
+      @logger = GELF::Logger.new
       @sender = mock
-      @notifier.instance_variable_set('@sender', @sender)
+      @logger.instance_variable_set('@sender', @sender)
     end
 
     should "respond to #close" do
-      assert @notifier.respond_to?(:close)
+      assert @logger.respond_to?(:close)
     end
 
     context "#add" do
       # logger.add(Logger::INFO, 'Message')
-      should "implement add method with level and message from parameters" do
-        @notifier.expects(:notify_with_level!).with do |level, hash|
+      should "implement add method with level and message from parameters, facility from defaults" do
+        @logger.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
-          hash['short_message'] == 'Message'
+          hash['short_message'] == 'Message' &&
+          hash['facility'] == 'gelf-rb'
         end
-        @notifier.add(GELF::INFO, 'Message')
+        @logger.add(GELF::INFO, 'Message')
       end
 
       # logger.add(Logger::INFO, RuntimeError.new('Boom!'))
-      should "implement add method with level and exception from parameters" do
-        @notifier.expects(:notify_with_level!).with do |level, hash|
+      should "implement add method with level and exception from parameters, facility from defaults" do
+        @logger.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
           hash['short_message'] == 'RuntimeError: Boom!' &&
-          hash['full_message'] =~ /^Backtrace/
+          hash['full_message'] =~ /^Backtrace/ &&
+          hash['facility'] == 'gelf-rb'
         end
-        @notifier.add(GELF::INFO, RuntimeError.new('Boom!'))
+        @logger.add(GELF::INFO, RuntimeError.new('Boom!'))
       end
 
       # logger.add(Logger::INFO) { 'Message' }
-      should "implement add method with level from parameter and message from block" do
-        @notifier.expects(:notify_with_level!).with do |level, hash|
+      should "implement add method with level from parameter, message from block, facility from defaults" do
+        @logger.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
-          hash['short_message'] == 'Message'
+          hash['short_message'] == 'Message' &&
+          hash['facility'] == 'gelf-rb'
         end
-        @notifier.add(GELF::INFO) { 'Message' }
+        @logger.add(GELF::INFO) { 'Message' }
       end
 
       # logger.add(Logger::INFO) { RuntimeError.new('Boom!') }
-      should "implement add method with level from parameter and exception from block" do
-        @notifier.expects(:notify_with_level!).with do |level, hash|
+      should "implement add method with level from parameter, exception from block, facility from defaults" do
+        @logger.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
           hash['short_message'] == 'RuntimeError: Boom!' &&
-          hash['full_message'] =~ /^Backtrace/
+          hash['full_message'] =~ /^Backtrace/ &&
+          hash['facility'] == 'gelf-rb'
         end
-        @notifier.add(GELF::INFO) { RuntimeError.new('Boom!') }
+        @logger.add(GELF::INFO) { RuntimeError.new('Boom!') }
       end
 
       # logger.add(Logger::INFO, 'Message', 'Facility')
       should "implement add method with level, message and facility from parameters" do
-        @notifier.expects(:notify_with_level!).with do |level, hash|
+        @logger.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
           hash['short_message'] == 'Message' &&
           hash['facility'] == 'Facility'
         end
-        @notifier.add(GELF::INFO, 'Message', 'Facility')
+        @logger.add(GELF::INFO, 'Message', 'Facility')
       end
 
       # logger.add(Logger::INFO, RuntimeError.new('Boom!'), 'Facility')
       should "implement add method with level, exception and facility from parameters" do
-        @notifier.expects(:notify_with_level!).with do |level, hash|
+        @logger.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
           hash['short_message'] == 'RuntimeError: Boom!' &&
           hash['full_message'] =~ /^Backtrace/ &&
           hash['facility'] == 'Facility'
         end
-        @notifier.add(GELF::INFO, RuntimeError.new('Boom!'), 'Facility')
+        @logger.add(GELF::INFO, RuntimeError.new('Boom!'), 'Facility')
       end
 
       # logger.add(Logger::INFO, 'Facility') { 'Message' }
-      should "implement add method with level and facility from parameters and message from block" do
-        @notifier.expects(:notify_with_level!).with do |level, hash|
+      should "implement add method with level and facility from parameters, message from block" do
+        @logger.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
           hash['short_message'] == 'Message' &&
           hash['facility'] == 'Facility'
         end
-        @notifier.add(GELF::INFO, 'Facility') { 'Message' }
+        @logger.add(GELF::INFO, 'Facility') { 'Message' }
       end
 
       # logger.add(Logger::INFO, 'Facility') { RuntimeError.new('Boom!') }
-      should "implement add method with level and facility from parameters and exception from block" do
-        @notifier.expects(:notify_with_level!).with do |level, hash|
+      should "implement add method with level and facility from parameters, exception from block" do
+        @logger.expects(:notify_with_level!).with do |level, hash|
           level == GELF::INFO &&
           hash['short_message'] == 'RuntimeError: Boom!' &&
           hash['full_message'] =~ /^Backtrace/ &&
           hash['facility'] == 'Facility'
         end
-        @notifier.add(GELF::INFO, 'Facility') { RuntimeError.new('Boom!') }
+        @logger.add(GELF::INFO, 'Facility') { RuntimeError.new('Boom!') }
       end
     end
 
     GELF::Levels.constants.each do |const|
       # logger.error "Argument #{ @foo } mismatch."
-      should "call notify with level #{const} from method name and message from parameter" do
-        @notifier.expects(:add).with(GELF.const_get(const), 'message')
-        @notifier.__send__(const.downcase, 'message')
+      should "call add with level #{const} from method name, message from parameter" do
+        @logger.expects(:add).with(GELF.const_get(const), 'message')
+        @logger.__send__(const.downcase, 'message')
       end
 
       # logger.fatal { "Argument 'foo' not given." }
-      should "call notify with level #{const} from method name and message from block" do
-        @notifier.expects(:add).with(GELF.const_get(const), 'message')
-        @notifier.__send__(const.downcase) { 'message' }
+      should "call add with level #{const} from method name, message from block" do
+        @logger.expects(:add).with(GELF.const_get(const), 'message')
+        @logger.__send__(const.downcase) { 'message' }
       end
 
       # logger.info('initialize') { "Initializing..." }
-      should "call notify with level #{const} from method name, facility from parameter and message from block" do
-        @notifier.expects(:add).with(GELF.const_get(const), 'message', 'facility')
-        @notifier.__send__(const.downcase, 'facility') { 'message' }
+      should "call add with level #{const} from method name, facility from parameter, message from block" do
+        @logger.expects(:add).with(GELF.const_get(const), 'message', 'facility')
+        @logger.__send__(const.downcase, 'facility') { 'message' }
       end
 
       should "respond to #{const.downcase}?" do
-        @notifier.level = GELF.const_get(const) - 1
-        assert @notifier.__send__(const.to_s.downcase + '?')
-        @notifier.level = GELF.const_get(const)
-        assert @notifier.__send__(const.to_s.downcase + '?')
-        @notifier.level = GELF.const_get(const) + 1
-        assert !@notifier.__send__(const.to_s.downcase + '?')
+        @logger.level = GELF.const_get(const) - 1
+        assert @logger.__send__(const.to_s.downcase + '?')
+        @logger.level = GELF.const_get(const)
+        assert @logger.__send__(const.to_s.downcase + '?')
+        @logger.level = GELF.const_get(const) + 1
+        assert !@logger.__send__(const.to_s.downcase + '?')
       end
     end
 
-    should "support Notifier#<<" do
-      @notifier.expects(:notify_with_level!).with do |nil_, hash|
-        hash['short_message'] == "Message" &&
-        hash['level'] == GELF::UNKNOWN
+    should "support Logger#<<" do
+      @logger.expects(:notify_with_level!).with do |level, hash|
+        level == GELF::UNKNOWN &&
+        hash['short_message'] == "Message"
       end
-      @notifier << "Message"
+      @logger << "Message"
     end
   end
 end

data/test/test_notifier.rb

@@ -6,12 +6,13 @@ class TestNotifier < Test::Unit::TestCase
   should "allow access to host, port, max_chunk_size and default_options" do
     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 [[['localhost', 12201]], 1420], [n.addresses, n.max_chunk_size]
     assert_equal( { 'version' => '1.0', 'level' => GELF::UNKNOWN,
                     '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 ['graylog2.org', 7777, 8154], [n.host, n.port, n.max_chunk_size]
+    n.addresses, n.max_chunk_size, n.default_options = [['graylog2.org', 7777]], :lan, {:host => 'grayhost'}
+    assert_equal [['graylog2.org', 7777]], n.addresses
+    assert_equal 8154, n.max_chunk_size
     assert_equal({'host' => 'grayhost'}, n.default_options)
 
     n.max_chunk_size = 1337.1
@@ -87,6 +88,10 @@ class TestNotifier < Test::Unit::TestCase
         assert !hash.has_key?(:short_message)
       end
 
+      should "not overwrite keys on convert" do
+        assert_raise(ArgumentError) { @notifier.__send__(:extract_hash, :short_message => :message1, 'short_message' => 'message2') }
+      end
+
       should "use default_options" do
         @notifier.default_options = {:foo => 'bar', 'short_message' => 'will be hidden by explicit argument', 'host' => 'some_host'}
         hash = @notifier.__send__(:extract_hash, { 'version' => '1.0', 'short_message' => 'message' })
@@ -117,16 +122,18 @@ class TestNotifier < Test::Unit::TestCase
 
     context "serialize_hash" do
       setup do
+        @notifier.level_mapping = :direct
         @notifier.instance_variable_set('@hash', { 'level' => GELF::WARN, 'field' => 'value' })
         @data = @notifier.__send__(:serialize_hash)
-        assert_instance_of Enumerable::Enumerator, @data
+        assert @data.respond_to?(:each)
         @deserialized_hash = JSON.parse(Zlib::Inflate.inflate(@data.to_a.pack('C*')))
         assert_instance_of Hash, @deserialized_hash
       end
 
-      should "map level" do
+      should "map level using mapping" do
         assert_not_equal GELF::WARN, @deserialized_hash['level']
-        assert_equal GELF::LEVELS_MAPPING[GELF::WARN], @deserialized_hash['level']
+        assert_not_equal GELF::LOGGER_MAPPING[GELF::WARN], @deserialized_hash['level']
+        assert_equal GELF::DIRECT_MAPPING[GELF::WARN], @deserialized_hash['level']
       end
     end
 

data/test/test_ruby_sender.rb

@@ -3,18 +3,25 @@ require 'helper'
 class TestRubyUdpSender < Test::Unit::TestCase
   context "with ruby sender" do
     setup do
-      @host, @port = 'localhost', 12201
-      @sender = GELF::RubyUdpSender.new('localhost', 12201)
-      @datagrams = %w(d1 d2 d3)
+      @addresses = [['localhost', 12201], ['localhost', 12202]]
+      @sender = GELF::RubyUdpSender.new(@addresses)
+      @datagrams1 = %w(d1 d2 d3)
+      @datagrams2 = %w(e1 e2 e3)
     end
 
     context "send_datagrams" do
       setup do
-        @sender.send_datagrams(@datagrams)
+        @sender.send_datagrams(@datagrams1)
+        @sender.send_datagrams(@datagrams2)
       end
 
-      before_should "be called with 3 times correct parameters" do
-        UDPSocket.any_instance.expects(:send).times(3).with(instance_of(String), 0, @host, @port).returns(@datagrams)
+      before_should "be called 3 times with 1st and 2nd address" do
+        UDPSocket.any_instance.expects(:send).times(3).with do |datagram, _, host, port|
+          datagram.start_with?('d') && host == 'localhost' && port == 12201
+        end
+        UDPSocket.any_instance.expects(:send).times(3).with do |datagram, _, host, port|
+          datagram.start_with?('e') && host == 'localhost' && port == 12202
+        end
       end
     end
   end

data/test/test_severity.rb

@@ -1,8 +1,8 @@
 require 'helper'
 
 class TestSeverity < Test::Unit::TestCase
-  should "map Ruby Logger levels to syslog levels" do
-    GELF::LEVELS_MAPPING.each do |ruby_level, syslog_level|
+  should "map Ruby Logger levels to syslog levels as SyslogLogger" do
+    GELF::LOGGER_MAPPING.each do |ruby_level, syslog_level|
       assert_not_equal syslog_level, ruby_level
     end
   end

metadata

@@ -1,22 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: gelf
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 62196385
+  prerelease: 6
   segments: 
   - 1
+  - 2
+  - 0
+  - beta
   - 1
-  - 3
-  version: 1.1.3
+  version: 1.2.0.beta1
 platform: ruby
 authors: 
-- Aleksey Palazhchenko
+- Alexey Palazhchenko
 - Lennart Koopmann
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-01-23 00:00:00 +01:00
-default_executable: 
+date: 2011-05-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -26,6 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -39,6 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -52,13 +56,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id003
 description: Library to send GELF messages to Graylog2 logging server. Supports plain-text, GELF messages and exceptions.
-email: aleksey.palazhchenko@gmail.com
+email: alexey.palazhchenko@gmail.com
 executables: []
 
 extensions: []
@@ -67,7 +72,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - CHANGELOG
 - LICENSE
 - README.rdoc
@@ -76,25 +80,21 @@ files:
 - benchmarks/notifier.rb
 - gelf.gemspec
 - lib/gelf.rb
-- lib/gelf/deprecations.rb
-- lib/gelf/em_sender.rb
 - lib/gelf/logger.rb
 - lib/gelf/notifier.rb
 - lib/gelf/ruby_sender.rb
 - lib/gelf/severity.rb
 - test/helper.rb
-- test/test_deprecations.rb
 - test/test_logger.rb
 - test/test_notifier.rb
 - test/test_ruby_sender.rb
 - test/test_severity.rb
-has_rdoc: true
 homepage: http://github.com/Graylog2/gelf-rb
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -102,28 +102,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: Library to send GELF messages to Graylog2 logging server.
-test_files: 
-- test/helper.rb
-- test/test_logger.rb
-- test/test_notifier.rb
-- test/test_severity.rb
-- test/test_ruby_sender.rb
-- test/test_deprecations.rb
+test_files: []
+

data/.gitignore

@@ -1,6 +0,0 @@
-pkg/
-coverage/
-rdoc/
-tmp/
-
-.DS_Store

data/lib/gelf/deprecations.rb

@@ -1,37 +0,0 @@
-# Deprecated, do not use in new code, to be removed.
-class Gelf
-  def deprecate(instead)
-    Kernel.caller.first =~ /:in `(.+)'$/
-    warn "Gelf##{$1} is deprecated. Use #{instead} instead."
-  end
-
-  attr_reader :notifier, :message
-
-  def initialize(hostname, port)
-    deprecate('GELF::Notifier.new(hostname, port)')
-    @notifier = GELF::Notifier.new(hostname, port)
-    @message = {}
-  end
-
-  # bizarre, but Gelf did this...
-  def send
-    deprecate('GELF::Notifier#notify(message)')
-    @notifier.notify(@message)
-  end
-
-  [:short_message, :full_message, :level, :host, :line, :file].each do |attribute|
-    define_method attribute do
-      deprecate("GELF::Message##{attribute}")
-      @message[attribute]
-    end
-
-    define_method "#{attribute}=" do |value|
-      deprecate("GELF::Message##{attribute} = value")
-      @message[attribute] = value
-    end
-  end
-
-  def add_additional(key, value)
-    @message[key] = value
-  end
-end

data/lib/gelf/em_sender.rb

@@ -1,19 +0,0 @@
-# module GELF
-#   # TCP Sender for EventMachine.
-#   class EMTcpSender
-#     def initialize(host, port)
-#     end
-#
-#     def send_datagrams(datagrams)
-#     end
-#   end
-#
-#   # UDP Sender for EventMachine.
-#   class EMUdpSender
-#     def initialize(host, port)
-#     end
-#
-#     def send_datagrams(datagrams)
-#     end
-#   end
-# end

data/test/test_deprecations.rb

@@ -1,38 +0,0 @@
-require 'helper'
-
-class TestDeprecations < Test::Unit::TestCase
-  context "with Gelf object" do
-    setup do
-      @verbose, $VERBOSE = $VERBOSE, nil
-      @g = Gelf.new('host', 12345)
-    end
-
-    teardown do
-      $VERBOSE = @verbose
-    end
-
-    should "deprecate Gelf.new" do
-      assert_equal Gelf, @g.class
-      assert_equal 'host', @g.notifier.host
-      assert_equal 12345, @g.notifier.port
-      assert_equal Hash, @g.message.class
-    end
-
-    should "deprecate Gelf#send" do
-      @g.notifier.expects(:notify).with(@g.message)
-      @g.send
-    end
-
-    [:short_message, :full_message, :level, :host, :line, :file].each do |a|
-      should "deprecate Gelf##{a} and Gelf##{a}=" do
-        @g.__send__("#{a}=", 'value')
-        assert_equal 'value', @g.__send__(a)
-      end
-    end
-
-    should "set add additional params" do
-      @g.add_additional(:key, 'value')
-      assert_equal 'value', @g.message[:key]
-    end
-  end
-end