diff options
| author | Arnaud Cogoluègnes <acogoluegnes@gmail.com> | 2022-08-03 16:46:22 +0200 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2022-08-09 08:41:11 +0000 |
| commit | 390309ff55f5b22c03c32918440b48a414419610 (patch) | |
| tree | 4ef23b230c7889bc06c5fdc026b896ab09e4db45 | |
| parent | 766c7fa660cb1b3a34bc073d478c163aeeb3f156 (diff) | |
| download | rabbitmq-server-git-390309ff55f5b22c03c32918440b48a414419610.tar.gz | |
Keep stream_* return codes
To keep compatibility with the Erlang client's users.
References #5412
(cherry picked from commit f223845d4368f75040adce3e355f24f5d244403a)
| -rw-r--r-- | deps/rabbitmq_stream/src/rabbit_stream_manager.erl | 6 | ||||
| -rw-r--r-- | deps/rabbitmq_stream_common/src/rabbit_stream_core.erl | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/deps/rabbitmq_stream/src/rabbit_stream_manager.erl b/deps/rabbitmq_stream/src/rabbit_stream_manager.erl index 08aca486aa..e13483ceb5 100644 --- a/deps/rabbitmq_stream/src/rabbit_stream_manager.erl +++ b/deps/rabbitmq_stream/src/rabbit_stream_manager.erl @@ -111,7 +111,7 @@ lookup_member(VirtualHost, Stream) -> {ok, #{leader_node => undefined | pid(), replica_nodes => [pid()]}} | - {error, not_found} | {error, not_available}. + {error, stream_not_found} | {error, stream_not_available}. topology(VirtualHost, Stream) -> gen_server:call(?MODULE, {topology, VirtualHost, Stream}). @@ -396,6 +396,10 @@ handle_call({topology, VirtualHost, Stream}, _From, State) -> _ -> {error, not_available} end; + {error, not_found} -> + {error, stream_not_found}; + {error, not_available} -> + {error, stream_not_available}; R -> R end, diff --git a/deps/rabbitmq_stream_common/src/rabbit_stream_core.erl b/deps/rabbitmq_stream_common/src/rabbit_stream_core.erl index 34ad9f9232..cdc5bc75d5 100644 --- a/deps/rabbitmq_stream_common/src/rabbit_stream_core.erl +++ b/deps/rabbitmq_stream_common/src/rabbit_stream_core.erl @@ -406,9 +406,9 @@ response_body({metadata = Tag, Endpoints, Metadata}) -> maps:fold(fun (Stream, Info, Acc) when is_atom(Info) -> Code = case Info of - not_found -> + stream_not_found -> ?RESPONSE_CODE_STREAM_DOES_NOT_EXIST; - not_available -> + stream_not_available -> ?RESPONSE_CODE_STREAM_NOT_AVAILABLE end, StreamLength = byte_size(Stream), |