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

Feature/robust against couch connection issues

5 files changed, 12 insertions, 12 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index d1fd014..918fdba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -25,7 +25,7 @@ PATH
     leap_web_core (0.2.8)
       couchrest (~> 1.1.3)
       couchrest_model (~> 2.0.0)
-      couchrest_session_store (~> 0.2.2)
+      couchrest_session_store (~> 0.2.4)
       json
       rails (~> 3.2.11)
 
@@ -105,12 +105,12 @@ GEM
       mime-types (~> 1.15)
       multi_json (~> 1.0)
       rest-client (~> 1.6.1)
-    couchrest_model (2.0.0)
+    couchrest_model (2.0.1)
       activemodel (>= 3.0)
       couchrest (~> 1.1.3)
       mime-types (>= 1.15)
       tzinfo (>= 0.3.22)
-    couchrest_session_store (0.2.2)
+    couchrest_session_store (0.2.4)
       actionpack
       couchrest
       couchrest_model
@@ -145,7 +145,7 @@ GEM
       haml (~> 3.1)
       railties (>= 3.1, < 4.1)
     hike (1.2.3)
-    i18n (0.6.5)
+    i18n (0.6.9)
     journey (1.0.4)
     jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
@@ -162,7 +162,7 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.25)
+    mime-types (1.25.1)
     mini_portile (0.5.1)
     mocha (0.13.3)
       metaclass (~> 0.0.1)
diff --git a/config/defaults.yml b/config/defaults.yml
index 4530d47..4bd8eec 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -72,6 +72,7 @@ development:
   domain: example.org
   secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
   payment: []
+  reraise_errors: true
 
 test:
   <<: *downloads
@@ -83,6 +84,7 @@ test:
   domain: test.me
   secret_token: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
   payment: [billing]
+  reraise_errors: true
 
 production:
   <<: *downloads
diff --git a/core/leap_web_core.gemspec b/core/leap_web_core.gemspec
index 4109a03..7ca4d90 100644
--- a/core/leap_web_core.gemspec
+++ b/core/leap_web_core.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "couchrest", "~> 1.1.3"
   s.add_dependency "couchrest_model", "~> 2.0.0"
-  s.add_dependency "couchrest_session_store", "~> 0.2.2"
+  s.add_dependency "couchrest_session_store", "~> 0.2.4"
 
   s.add_dependency "json"
 end
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
 
diff --git a/test/integration/home_test.rb b/test/integration/os_detection_test.rb
index 126a420..cb254aa 100644
--- a/test/integration/home_test.rb
+++ b/test/integration/os_detection_test.rb
@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class AccountTest < BrowserIntegrationTest
+class OsDetectionTest < BrowserIntegrationTest
 
   setup do
     Capybara.current_driver = Capybara.javascript_driver