summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2014-11-30 21:20:53 -0800
committerelijah <elijah@riseup.net>2014-11-30 21:20:53 -0800
commit31946069a88767e65f07de53d726a0ac1657db10 (patch)
treeffb55c5e919159cece5705dfde58e8950ee79c48 /lib
parent9405a5acf470035aed2985f583c9ac386c637ae4 (diff)
do not log an error if db or design docs already exist (another tapicero created it).
Diffstat (limited to 'lib')
-rw-r--r--lib/tapicero/user_database.rb26
1 files changed, 23 insertions, 3 deletions
diff --git a/lib/tapicero/user_database.rb b/lib/tapicero/user_database.rb
index 7e205ad..7c621ae 100644
--- a/lib/tapicero/user_database.rb
+++ b/lib/tapicero/user_database.rb
@@ -49,7 +49,10 @@ module Tapicero
def upload_design_doc(file)
old = CouchRest.get design_url(file.basename('.json'))
rescue RestClient::ResourceNotFound
- CouchRest.put design_url(file.basename('.json')), JSON.parse(file.read)
+ begin
+ CouchRest.put design_url(file.basename('.json')), JSON.parse(file.read)
+ rescue RestClient::Conflict
+ end
end
@@ -65,10 +68,23 @@ module Tapicero
protected
+ #
+ # Sometimes attempting to create the db will fail with PreconditionFailed.
+ # This error is supposed to be returned only when the db already exists.
+ # However, sometimes the db will be created and PreconditionFailed will
+ # be returned.
+ #
+ # Might throw one of the following exceptions:
+ # * RestClient::BadRequest
+ # * RestClient::Unauthorized
+ #
def create_db
db.info # test if db exists
rescue RestClient::ResourceNotFound
- couch.create_db(db.name)
+ begin
+ couch.create_db(db.name)
+ rescue RestClient::PreconditionFailed
+ end
end
def delete_db
@@ -85,7 +101,7 @@ module Tapicero
if second_try
log_error "#{action} #{db.name} failed twice due to: ", exc
else
- log_error "#{action} #{db.name} failed due to: ", exc
+ log_info "#{action} #{db.name} failed (trying again soon): ", exc
sleep 5
second_try = true
retry
@@ -98,6 +114,10 @@ module Tapicero
Tapicero.logger.debug exc.backtrace.join("\n")
end
+ def log_info(message, exc)
+ Tapicero.logger.info message.to_s + exc.class.name + ': ' + exc.to_s
+ end
+
def secured?
retry_request_once "Checking security of" do
CouchRest.get(security_url).keys.any?