Merge pull request #121 from azul/feature/robust-against-couch-connection-issues

Feature/robust against couch connection issues

1 files changed, 3 insertions, 5 deletions

diff --git a/core/lib/extensions/couchrest.rb b/core/lib/extensions/couchrest.rb
index 84cfbb3..9f27c3a 100644
--- a/core/lib/extensions/couchrest.rb
+++ b/core/lib/extensions/couchrest.rb
@@ -23,10 +23,6 @@ module CouchRest
       end
     end
 
-    module Errors
-      class ConnectionFailed < CouchRestModelError; end
-    end
-
     module Connection
 
       module ClassMethods
@@ -36,7 +32,9 @@ module CouchRest
         rescue RestClient::Unauthorized,
           Errno::EHOSTUNREACH,
           Errno::ECONNREFUSED => e
-          raise CouchRest::Model::Errors::ConnectionFailed.new(e.to_s)
+          message = "Could not connect to couch database #{db} due to #{e.to_s}"
+          Rails.logger.warn message
+          raise e.class.new(message) if APP_CONFIG[:reraise_errors]
         end
       end