summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2018-06-06 15:35:54 +0300
committerMichael Klishin <mklishin@pivotal.io>2018-06-06 15:39:48 +0300
commitac50a38ea8ef9fcdcaf49aca5c711ccdd4ad3c1f (patch)
treef7969cbd41104d5e2dea2d5d226b0e96be2fd20a /src
parenta210d82f54a133eae167da036302c1c63b3d4d9a (diff)
downloadrabbitmq-server-git-ac50a38ea8ef9fcdcaf49aca5c711ccdd4ad3c1f.tar.gz
Use rabbit_data_coercion:to_list/1 to coerce discovered node name to a string
Previous implementation breaks on OTP 21. [#157964874] (cherry picked from commit da011eb94ed79463daf912756dd866f2d777c0c3)
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_peer_discovery.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_peer_discovery.erl b/src/rabbit_peer_discovery.erl
index 19df5c07cb..9c8aa90e18 100644
--- a/src/rabbit_peer_discovery.erl
+++ b/src/rabbit_peer_discovery.erl
@@ -279,7 +279,10 @@ normalize({error, Reason}) ->
-spec format_discovered_nodes(Nodes :: list()) -> string().
format_discovered_nodes(Nodes) ->
- string:join(lists:map(fun (Val) -> hd(io_lib:format("~s", [Val])) end, Nodes), ", ").
+ %% NOTE: in OTP 21 string:join/2 is deprecated but still available.
+ %% Its recommended replacement is not a drop-in one, though, so
+ %% we will not be switching just yet.
+ string:join(lists:map(fun rabbit_data_coercion:to_list/1, Nodes), ", ").