Skip to content

Commit 17942ec

Browse files
authored
Merge pull request #14146 from rabbitmq/mergify/bp/v4.1.x/pr-14143
Close stream consumer log after stream is deleted or unavailable (backport #14143)
2 parents 7d9dbf9 + 8b64572 commit 17942ec

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

deps/rabbitmq_stream/src/rabbit_stream_reader.erl

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3309,25 +3309,29 @@ clean_subscriptions(MemberPid, Stream,
33093309
fun(SubId, {DelSubIds, Rqsts0}) ->
33103310
#{SubId := Consumer} = Consumers,
33113311
case {MemberPid, Consumer} of
3312-
{undefined, _C} ->
3312+
{undefined, #consumer{log = Log}} ->
33133313
rabbit_stream_metrics:consumer_cancelled(self(),
33143314
stream_r(Stream,
33153315
C0),
33163316
SubId,
33173317
Username),
3318+
3319+
close_log(Log),
33183320
Rqsts1 = maybe_unregister_consumer(
33193321
VirtualHost, Consumer,
33203322
single_active_consumer(Consumer),
33213323
Rqsts0),
33223324
{[SubId | DelSubIds], Rqsts1};
33233325
{MemberPid,
3324-
#consumer{configuration =
3325-
#consumer_configuration{member_pid = MemberPid}}} ->
3326+
#consumer{
3327+
log = Log,
3328+
configuration = #consumer_configuration{member_pid = MemberPid}}} ->
33263329
rabbit_stream_metrics:consumer_cancelled(self(),
33273330
stream_r(Stream,
33283331
C0),
33293332
SubId,
33303333
Username),
3334+
close_log(Log),
33313335
Rqsts1 = maybe_unregister_consumer(
33323336
VirtualHost, Consumer,
33333337
single_active_consumer(Consumer),

0 commit comments

Comments
 (0)