gelf 1.1.0.beta2 → 1.1.0.beta3

data/VERSION

@@ -1 +1 @@
-1.1.0.beta2
+1.1.0.beta3

data/gelf.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gelf}
-  s.version = "1.1.0.beta2"
+  s.version = "1.1.0.beta3"
 
   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-25}
+  s.date = %q{2010-11-26}
   s.description = %q{Suports plain-text, GELF messages and exceptions.}
   s.email = %q{lennart@socketfeed.com}
   s.extra_rdoc_files = [

data/lib/gelf/notifier.rb

@@ -6,13 +6,15 @@ module GELF
       attr_accessor :last_chunk_id
     end
 
-    attr_accessor :host, :port, :default_options
+    attr_accessor :host, :port, :default_options, :enabled
     attr_reader :max_chunk_size, :level
 
     # +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
+
       self.level = GELF::DEBUG
 
       self.host, self.port, self.max_chunk_size = host, port, max_size
@@ -40,7 +42,19 @@ module GELF
     end
 
     def level=(new_level)
-      @level = new_level
+      @level = if new_level.is_a?(Fixnum)
+                 new_level
+               else
+                 GELF.const_get(new_level.to_s.upcase)
+               end
+    end
+
+    def disable
+      @enabled = false
+    end
+
+    def enable
+      @enabled = true
     end
 
     # Same as notify!, but rescues all exceptions (including +ArgumentError+)
@@ -79,6 +93,7 @@ module GELF
     end
 
     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

data/test/test_notifier.rb

@@ -125,6 +125,13 @@ class TestNotifier < Test::Unit::TestCase
         @notifier.level = GELF::WARN
       end
 
+      ['debug', 'DEBUG', :debug].each do |l|
+        should "allow to set threshold as #{l.inspect}" do
+          @notifier.level = l
+          assert_equal GELF::DEBUG, @notifier.level
+        end
+      end
+
       should "not send notifications with level below threshold" do
         @sender.expects(:send_datagrams).never
         @notifier.notify!(HASH.merge('level' => GELF::DEBUG))
@@ -136,6 +143,29 @@ class TestNotifier < Test::Unit::TestCase
       end
     end
 
+    context "when disabled" do
+      setup do
+        @notifier.disable
+      end
+
+      should "not send datagrams" do
+        @sender.expects(:send_datagrams).never
+        @notifier.expects(:extract_hash).never
+        @notifier.notify!(HASH)
+      end
+
+      context "and enabled again" do
+        setup do
+          @notifier.enable
+        end
+
+        should "send datagrams" do
+          @sender.expects(:send_datagrams)
+          @notifier.notify!(HASH)
+        end
+      end
+    end
+
     should "pass valid data to sender" do
       @sender.expects(:send_datagrams).with do |datagrams|
         datagrams.is_a?(Array) && datagrams[0].is_a?(String)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: gelf
 version: !ruby/object:Gem::Version 
-  hash: -1848230062
+  hash: -1848230061
   prerelease: true
   segments: 
   - 1
   - 1
   - 0
-  - beta2
-  version: 1.1.0.beta2
+  - beta3
+  version: 1.1.0.beta3
 platform: ruby
 authors: 
 - Alexey Palazhchenko
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-25 00:00:00 +03:00
+date: 2010-11-26 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency