protection against eventual notifiers timeout error

aslakhellesoy · Nov 20, 2008 · c969e8c · c969e8c
1 parent a10e36a
commit c969e8c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/lib/integrity.rb b/lib/integrity.rb
@@ -12,6 +12,7 @@
 require 'yaml'
 require 'logger'
 require 'digest/sha1'
+require 'timeout'
 
 require "core_ext/object"
 require "core_ext/string"

diff --git a/lib/integrity/notifier/base.rb b/lib/integrity/notifier/base.rb
@@ -2,7 +2,9 @@ module Integrity
   class Notifier
     class Base
       def self.notify_of_build(build, config)
-        new(build, config).deliver!
+        Timeout.timeout(6) do
+          new(build, config).deliver!
+        end
       end
 
       def self.to_haml

diff --git a/spec/notifier/base_spec.rb b/spec/notifier/base_spec.rb
@@ -32,6 +32,12 @@ def klass
       notifier.should_receive(:deliver!)
       klass.notify_of_build(mock_build, notifier_config)
     end
+
+    it "should protect itself from timeout" do
+      lambda do
+        notifier.stub!(:deliver!).and_raise(Timeout::Error)
+      end.should_not raise_error
+    end
   end
 
   describe "generating the config form" do