Merge pull request #3078 from rabbitmq/rabbitmq-server-3072

When reacting to a forced event refresh command, emit consumer creation events for all consumers

Author: HoloRin

deps/rabbit/src/rabbit_amqqueue_process.erl

@@ -1620,23 +1620,16 @@ handle_cast({credit, ChPid, CTag, Credit, Drain},
 % This event is necessary for the stats timer to be initialized with
 % the correct values once the management agent has started
 handle_cast({force_event_refresh, Ref},
-            State = #q{consumers       = Consumers,
-                       active_consumer = Holder}) ->
+            State = #q{consumers = Consumers}) ->
     rabbit_event:notify(queue_created, infos(?CREATION_EVENT_KEYS, State), Ref),
     QName = qname(State),
     AllConsumers = rabbit_queue_consumers:all(Consumers),
-    case Holder of
-        none ->
-            [emit_consumer_created(
-               Ch, CTag, false, AckRequired, QName, Prefetch,
-               Args, Ref, ActingUser) ||
-                {Ch, CTag, AckRequired, Prefetch, _, _, Args, ActingUser}
-                    <- AllConsumers];
-        {Ch, CTag} ->
-            [{Ch, CTag, AckRequired, Prefetch, _, _, Args, ActingUser}] = AllConsumers,
-            emit_consumer_created(
-              Ch, CTag, true, AckRequired, QName, Prefetch, Args, Ref, ActingUser)
-    end,
+    rabbit_log:debug("Queue ~s forced to re-emit events, consumers: ~p", [rabbit_misc:rs(QName), AllConsumers]),
+    [emit_consumer_created(
+       Ch, CTag, ActiveOrExclusive, AckRequired, QName, Prefetch,
+       Args, Ref, ActingUser) ||
+        {Ch, CTag, AckRequired, Prefetch, ActiveOrExclusive, _, Args, ActingUser}
+            <- AllConsumers],
     noreply(rabbit_event:init_stats_timer(State, #q.stats_timer));
 
 handle_cast(notify_decorators, State) ->