From 72087656e5092fd744f4314c9a0e91825399fefc Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 13 Dec 2013 11:16:11 +0100
Subject: proceed even if the couch is unreachable

* in case the user has a session id, keep it but proceed without a session
* in case we can't initialize the models proceed
* if APP_CONFIG[:reraise_errors] is set we'll crash instead in the latter case

default to reraise errors in dev and test environments.
---
 Gemfile.lock                     | 4 ++--
 config/defaults.yml              | 2 ++
 core/leap_web_core.gemspec       | 2 +-
 core/lib/extensions/couchrest.rb | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1c24bc6..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.3)
+      couchrest_session_store (~> 0.2.4)
       json
       rails (~> 3.2.11)
 
@@ -110,7 +110,7 @@ GEM
       couchrest (~> 1.1.3)
       mime-types (>= 1.15)
       tzinfo (>= 0.3.22)
-    couchrest_session_store (0.2.3)
+    couchrest_session_store (0.2.4)
       actionpack
       couchrest
       couchrest_model
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 05874b2..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.3"
+  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 7450f59..9f27c3a 100644
--- a/core/lib/extensions/couchrest.rb
+++ b/core/lib/extensions/couchrest.rb
@@ -34,7 +34,7 @@ module CouchRest
           Errno::ECONNREFUSED => e
           message = "Could not connect to couch database #{db} due to #{e.to_s}"
           Rails.logger.warn message
-          raise e.class.new(message)
+          raise e.class.new(message) if APP_CONFIG[:reraise_errors]
         end
       end
 
-- 
cgit v1.2.3