summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Kocoloski <adam@cloudant.com>2013-04-16 10:12:58 -0400
committerRobert Newson <rnewson@apache.org>2014-07-23 17:57:21 +0100
commitd1995a5b76f10b94edc4bf729ace583d228e9ffa (patch)
tree8e4c3b021585dad2c10fb13bb327a5adb724ee2f
parentad795911100283df6740647492373b3377fc27bf (diff)
downloadcouchdb-d1995a5b76f10b94edc4bf729ace583d228e9ffa.tar.gz
Start per-node servers regardless of feature flag
Previously rexi_server_mon would fail to start per-node servers on a node where the use of those servers in rexi:cast messages was disabled by the "server_per_node" feature flag. This mostly defeats the purpose of the feature flag, which is to ensure that we can start all the per-node servers before we try to use them. Moreover, it cluttered up the error logs because rexi_server_mon would crash after trying to execute a `start_child` on rexi_server. The fix is not DRY but it does the job well. BugzID: 18970
-rw-r--r--src/rexi_server_mon.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rexi_server_mon.erl b/src/rexi_server_mon.erl
index 3545dba30..8cee6e9af 100644
--- a/src/rexi_server_mon.erl
+++ b/src/rexi_server_mon.erl
@@ -101,7 +101,8 @@ start_rexi_servers() ->
missing_servers() ->
- ServerIds = [rexi_utils:server_id(Node) || Node <- [node() | nodes()]],
+ ServerIds = [list_to_atom("rexi_server_" ++ atom_to_list(Node))
+ || Node <- [node() | nodes()]],
ChildIds = [Id || {Id, _, _, _} <- supervisor:which_children(?SUP_MODULE)],
ServerIds -- ChildIds.