summaryrefslogtreecommitdiff
path: root/provider_base/services/couchdb.rb
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-02-26 01:44:48 -0800
committerelijah <elijah@riseup.net>2016-02-26 01:44:48 -0800
commit89a3cd71f50a383a5f85510193087446da0e661f (patch)
treea49de8e4d2b2b937d37f1a5268ce05291203a54d /provider_base/services/couchdb.rb
parentef92ef66f61559b3fa2ea5a63a158e49573282dd (diff)
plain couchdb now required, bigcouch support disabled.
Diffstat (limited to 'provider_base/services/couchdb.rb')
-rw-r--r--provider_base/services/couchdb.rb32
1 files changed, 7 insertions, 25 deletions
diff --git a/provider_base/services/couchdb.rb b/provider_base/services/couchdb.rb
index 8271b9c5..dcf7df59 100644
--- a/provider_base/services/couchdb.rb
+++ b/provider_base/services/couchdb.rb
@@ -2,37 +2,19 @@
# custom logic for couchdb json resolution
# ============================================
#
-# bigcouch is no longer maintained, so now the default behavior is
-# to always use plain couchdb, unless there are more than one couchdb
-# node or if "couch.mode" property is set to "multimaster".
-#
-# in the past, it used to work like this:
-#
-# * if couch.master was set to true on one node, then do plain couchdb.
-# * if couch.master was not set anywhere, then do bigcouch.
-# * if couch.master was set on more than one node, then do bigcouch.
-#
-# Some of this legacy logic is still supported so that upgrading does
-# not unexpectedly turn bigcouch nodes into plain couchdb nodes.
+# bigcouch is no longer maintained, so now couchdb is required...
+# no matter what!
#
if self.couch['master']
- LeapCli::log :warning, "The node property 'couch.master' is deprecated.\n" +
- " In the future, you must set 'couch.mode' to either 'plain' or 'multimaster'.\n" +
- " (node '#{self.name}')"
+ LeapCli::log :warning, %("The node property {couch.master:true} is deprecated.\n) +
+ %( Only {couch.mode:plain} is supported. (node #{self.name}))
end
couchdb_nodes = nodes_like_me['services' => 'couchdb']
if couchdb_nodes.size > 1
- apply_partial 'services/_couchdb_multimaster.json'
+ LeapCli::log :error, "Having multiple nodes with {services:couchdb} is no longer supported (nodes #{couchdb_nodes.keys.join(', ')})."
elsif self.couch.mode == "multimaster"
- if self.couch['master']
- # The old deprecated way of specifying plain couch is still being used
- apply_partial 'services/_couchdb_plain.json'
- else
- apply_partial 'services/_couchdb_multimaster.json'
- end
-else
- apply_partial 'services/_couchdb_plain.json'
-end
+ LeapCli::log :error, "Nodes with {couch.mode:multimaster} are no longer supported (node #{self.name})."
+end \ No newline at end of file