summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2020-07-14 03:41:25 +0300
committerMichael Klishin <michael@clojurewerkz.org>2020-07-14 03:50:33 +0300
commit21231bb4da7d7ca8ac0e5950aca251273d1476ac (patch)
treee72a9837a682d78572b88aa0ecf7d14978374374 /apps
parentf7a9449c6741de71e83af697220ec2f1bc5cabbd (diff)
downloadrabbitmq-server-git-21231bb4da7d7ca8ac0e5950aca251273d1476ac.tar.gz
Hide maintenance mode behind a feature flag
Otherwise we'd lose mixed version cluster compatibility. We cannot pre-create a table since it will be checked for existence on cluster peers. We cannot use an upgrade function since it assumes a cluster-wide restart. A feature flag avoids as many headaches as possible and when flags are detected to be compatible on node start, they are all enabled automatically. References #2321.
Diffstat (limited to 'apps')
-rw-r--r--apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl
index 2a2eb2b7fd..f04f252784 100644
--- a/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl
+++ b/apps/rabbitmq_prelaunch/src/rabbit_prelaunch_errors.erl
@@ -19,7 +19,7 @@ log_error(Error) ->
format_error({error, {duplicate_node_name, NodeName, NodeHost}}) ->
rabbit_misc:format(
- "ERROR: node with name ~p already running on ~p",
+ "ERROR: node with name ~p is already running on host ~p",
[NodeName, NodeHost]);
format_error({error, {epmd_error, NodeHost, EpmdReason}}) ->
rabbit_misc:format(
@@ -30,11 +30,11 @@ format_error({error, {invalid_dist_port_range, DistTcpPort}}) ->
"Invalid Erlang distribution TCP port: ~b", [DistTcpPort]);
format_error({error, {dist_port_already_used, Port, not_erlang, Host}}) ->
rabbit_misc:format(
- "ERROR: distribution port ~b in use on ~s "
+ "ERROR: distribution port ~b in use on host ~s "
"(by non-Erlang process?)", [Port, Host]);
format_error({error, {dist_port_already_used, Port, Name, Host}}) ->
rabbit_misc:format(
- "ERROR: distribution port ~b in use by ~s@~s", [Port, Name, Host]);
+ "ERROR: distribution port ~b in use by another node: ~s@~s", [Port, Name, Host]);
format_error({error, {erlang_dist_running_with_unexpected_nodename,
Unexpected, Node}}) ->
rabbit_misc:format(