gelf 1.2.0.beta1 → 1.3.1

data/.travis.yml

@@ -0,0 +1,9 @@
+rvm:
+  - 1.8.7
+  - ree
+  - 1.9.2
+  - 1.9.3
+  - jruby
+
+notifications:
+  irc: "irc.freenode.org#graylog2"

data/README.rdoc

@@ -1,8 +1,6 @@
 = 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.
+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://rdoc.info/github/Graylog2/gelf-rb/master/frames for API documentation.
 
 Works with Ruby 1.8.7 and 1.9.2. 1.8.6 is not supported.
 

data/VERSION

@@ -1 +1 @@
-1.2.0.beta1
+1.3.1

data/gelf.gemspec

@@ -4,19 +4,20 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{gelf}
-  s.version = "1.2.0.beta1"
+  s.name = "gelf"
+  s.version = "1.3.1"
 
-  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{alexey.palazhchenko@gmail.com}
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Alexey Palazhchenko", "Lennart Koopmann"]
+  s.date = "2011-10-28"
+  s.description = "Library to send GELF messages to Graylog2 logging server. Supports plain-text, GELF messages and exceptions."
+  s.email = "alexey.palazhchenko@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
   ]
   s.files = [
+    ".travis.yml",
     "CHANGELOG",
     "LICENSE",
     "README.rdoc",
@@ -35,10 +36,10 @@ Gem::Specification.new do |s|
     "test/test_ruby_sender.rb",
     "test/test_severity.rb"
   ]
-  s.homepage = %q{http://github.com/Graylog2/gelf-rb}
-  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.homepage = "http://github.com/Graylog2/gelf-rb"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.11"
+  s.summary = "Library to send GELF messages to Graylog2 logging server."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/lib/gelf/notifier.rb

@@ -6,7 +6,7 @@ module GELF
       attr_accessor :last_chunk_id
     end
 
-    attr_accessor :enabled, :collect_file_and_line
+    attr_accessor :enabled, :collect_file_and_line, :rescue_network_errors
     attr_reader :max_chunk_size, :level, :default_options, :level_mapping
 
     # +host+ and +port+ are host/ip and port of graylog2-server.
@@ -18,6 +18,7 @@ module GELF
 
       self.level = GELF::DEBUG
       self.max_chunk_size = max_size
+      self.rescue_network_errors = false
 
       self.default_options = default_options
       self.default_options['version'] = SPEC_VERSION
@@ -128,6 +129,8 @@ module GELF
   private
     def notify_with_level(message_level, *args)
       notify_with_level!(message_level, *args)
+    rescue SocketError
+      raise unless self.rescue_network_errors
     rescue Exception => exception
       notify_with_level!(GELF::UNKNOWN, exception)
     end
@@ -188,7 +191,7 @@ module GELF
     end
 
     def set_timestamp
-      @hash['timestamp'] = Time.now.utc.to_f
+      @hash['timestamp'] = Time.now.utc.to_f if @hash['timestamp'].nil?
     end
 
     def check_presence_of_mandatory_attributes
@@ -203,7 +206,7 @@ module GELF
       data = serialize_hash
       datagrams = []
 
-      # Maximum total size is 8192 byte for UDP datagram. Split to chunks if bigger. (GELFv2 supports chunking)
+      # Maximum total size is 8192 byte for UDP datagram. Split to chunks if bigger. (GELF v1.0 supports chunking)
       if data.count > @max_chunk_size
         id = self.class.last_chunk_id += 1
         msg_id = Digest::MD5.digest("#{Time.now.to_f}-#{id}")[0, 8]

data/test/test_notifier.rb

@@ -112,12 +112,18 @@ class TestNotifier < Test::Unit::TestCase
         assert_equal line + 1, hash['line']
       end
 
-      should "set timestamp" do
+      should "set timestamp to current time if not set" do
         hash = @notifier.__send__(:extract_hash, { 'version' => '1.0', 'short_message' => 'message' })
         assert_instance_of Float, hash['timestamp']
-        now = Time.now.utc.to_i
+        now = Time.now.utc.to_f
         assert ((now - 1)..(now + 1)).include?(hash['timestamp'])
       end
+
+      should "set timestamp to specified time" do
+        timestamp = 1319799449.13765
+        hash = @notifier.__send__(:extract_hash, { 'version' => '1.0', 'short_message' => 'message', 'timestamp' => timestamp })
+        assert_equal timestamp, hash['timestamp']
+      end
     end
 
     context "serialize_hash" do
@@ -125,7 +131,7 @@ class TestNotifier < Test::Unit::TestCase
         @notifier.level_mapping = :direct
         @notifier.instance_variable_set('@hash', { 'level' => GELF::WARN, 'field' => 'value' })
         @data = @notifier.__send__(:serialize_hash)
-        assert @data.respond_to?(:each)
+        assert @data.respond_to?(:each)  # Enumerable::Enumerator in 1.8, ::Enumerator in 1.9, so...
         @deserialized_hash = JSON.parse(Zlib::Inflate.inflate(@data.to_a.pack('C*')))
         assert_instance_of Hash, @deserialized_hash
       end
@@ -235,4 +241,19 @@ class TestNotifier < Test::Unit::TestCase
       assert_nothing_raised { @notifier.notify(:no_short_message => 'too bad') }
     end
   end
+
+  context "with notifier with real sender" do
+    setup do
+      @notifier = GELF::Notifier.new('no_such_host_321')
+    end
+
+    should "raise exception" do
+      assert_raise(SocketError) { @notifier.notify('Hello!') }
+    end
+
+    should "not raise exception if asked" do
+      @notifier.rescue_network_errors = true
+      assert_nothing_raised { @notifier.notify('Hello!') }
+    end
+  end
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gelf
 version: !ruby/object:Gem::Version 
-  hash: 62196385
-  prerelease: 6
+  hash: 25
+  prerelease: 
   segments: 
   - 1
-  - 2
-  - 0
-  - beta
+  - 3
   - 1
-  version: 1.2.0.beta1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Alexey Palazhchenko
@@ -18,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 Z
+date: 2011-10-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -72,6 +70,7 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .travis.yml
 - CHANGELOG
 - LICENSE
 - README.rdoc
@@ -109,18 +108,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.3
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Library to send GELF messages to Graylog2 logging server.