summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <michael@clojurewerkz.org>2020-02-02 15:31:30 +0300
committerMichael Klishin <michael@clojurewerkz.org>2020-02-02 15:31:49 +0300
commitde658de4a998dc3f205bb5882d06b5d1769c7db0 (patch)
treef239218f1a78a45a05f50462e593ebf21d898363 /src
parent8f90d8facf0d887b24d283d287aa6811adfa4b35 (diff)
downloadrabbitmq-server-git-de658de4a998dc3f205bb5882d06b5d1769c7db0.tar.gz
rabbit_guide:string/2: support binary prefixes
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_guid.erl10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/rabbit_guid.erl b/src/rabbit_guid.erl
index adf29089d2..a4b79f9175 100644
--- a/src/rabbit_guid.erl
+++ b/src/rabbit_guid.erl
@@ -148,12 +148,14 @@ gen_secure() ->
%% employs base64url encoding, which is safer in more contexts than
%% plain base64.
--spec string(guid(), any()) -> string().
+-spec string(guid() | string(), any()) -> string().
-string(G, Prefix) ->
- Prefix ++ "-" ++ rabbit_misc:base64url(G).
+string(G, Prefix) when is_list(Prefix) ->
+ Prefix ++ "-" ++ rabbit_misc:base64url(G);
+string(G, Prefix) when is_binary(Prefix) ->
+ binary_to_list(Prefix) ++ "-" ++ rabbit_misc:base64url(G).
--spec binary(guid(), any()) -> binary().
+-spec binary(guid() | string(), any()) -> binary().
binary(G, Prefix) ->
list_to_binary(string(G, Prefix)).