0
@@ -2,7 +2,7 @@ module Integrity
0
   class Notifier
0
     class Base
0
       def self.notify_of_build(build, config)
0
-        new(build, config).deliver!
0
+        Timeout.timeout(8) { new(build, config).deliver! }
0
       end
0
 
0
       def self.to_haml

0
@@ -76,7 +76,11 @@ module Integrity
0
       
0
       def send_notifications
0
         notifiers.each do |notifier|
0
-          notifier.notify_of_build last_build
0
+          begin
0
+            notifier.notify_of_build last_build
0
+          rescue Timeout::Error
0
+            next
0
+          end
0
         end
0
       end
0
   end

0
@@ -271,5 +271,12 @@ describe Integrity::Project do
0
       @email_notifier.should_receive(:notify_of_build).with(mock_build)
0
       @project.send(:send_notifications)
0
     end
0
+
0
+    it "should protect itself from eventual timeout error" do
0
+      @email_notifier.stub!(:notify_of_build).and_raise(Timeout::Error)
0
+      lambda do
0
+        @project.send(:send_notifications)
0
+      end.should_not raise_error
0
+    end
0
   end
0
 end