Naming

3 files changed, 12 insertions, 12 deletions

diff --git a/deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl b/deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl
index 217fad7a3c..25b3587ecf 100644
--- a/deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl
+++ b/deps/rabbitmq_shovel/src/rabbit_amqp091_shovel.erl
@@ -231,7 +231,7 @@ handle_source({'EXIT', Conn, Reason},
     {stop, {inbound_conn_died, Reason}};
 
 handle_source({'EXIT', _Pid, {shutdown, {server_initiated_close, ?PRECONDITION_FAILED, Reason}}}, _State) ->
-    {stop, {inbound_consumer_no_ack, Reason}};
+    {stop, {inbound_link_or_channel_closure, Reason}};
 
 handle_source(_Msg, _State) ->
     not_handled.
@@ -254,9 +254,9 @@ handle_dest(#'basic.cancel'{}, #{name := Name}) ->
 
 handle_dest({'EXIT', Conn, Reason}, #{dest := #{current := {Conn, _, _}}}) ->
     {stop, {outbound_conn_died, Reason}};
-    
+
 handle_dest({'EXIT', _Pid, {shutdown, {server_initiated_close, ?PRECONDITION_FAILED, Reason}}}, _State) ->
-    {stop, {outbound_consumer_no_ack, Reason}};
+    {stop, {outbound_link_or_channel_closure, Reason}};
 
 handle_dest(_Msg, _State) ->
     not_handled.
diff --git a/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl b/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl
index 8568a2000e..6bc64b375e 100644
--- a/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl
+++ b/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl
@@ -200,10 +200,10 @@ handle_source({amqp10_event, {link, Link, _Evt}},
 handle_source({'EXIT', Conn, Reason},
               #{source := #{current := #{conn := Conn}}}) ->
     {stop, {outbound_conn_died, Reason}};
-    
+
 handle_source({'EXIT', _Pid, {shutdown, {server_initiated_close, ?PRECONDITION_FAILED, Reason}}}, _State) ->
-    {stop, {inbound_consumer_no_ack, Reason}};
-    
+    {stop, {inbound_link_or_channel_closure, Reason}};
+
 handle_source(_Msg, _State) ->
     not_handled.
 
@@ -258,10 +258,10 @@ handle_dest({amqp10_event, {link, Link, _Evt}},
 handle_dest({'EXIT', Conn, Reason},
             #{dest := #{current := #{conn := Conn}}}) ->
     {stop, {outbound_conn_died, Reason}};
-    
+
 handle_dest({'EXIT', _Pid, {shutdown, {server_initiated_close, ?PRECONDITION_FAILED, Reason}}}, _State) ->
-    {stop, {outbound_consumer_no_ack, Reason}};
-    
+    {stop, {outbound_link_or_channel_closure, Reason}};
+
 handle_dest(_Msg, _State) ->
     not_handled.
 
diff --git a/deps/rabbitmq_shovel/src/rabbit_shovel_worker.erl b/deps/rabbitmq_shovel/src/rabbit_shovel_worker.erl
index e8945cc0bc..05de81bc8c 100644
--- a/deps/rabbitmq_shovel/src/rabbit_shovel_worker.erl
+++ b/deps/rabbitmq_shovel/src/rabbit_shovel_worker.erl
@@ -113,7 +113,7 @@ handle_info(Msg, State = #state{config = Config, name = Name}) ->
                 {stop, {outbound_conn_died, Reason}} ->
                     rabbit_log_shovel:error("Shovel ~s detected destination connection failure: ~p", [human_readable_name(Name), Reason]),
                     {stop, Reason, State};
-	            {stop, {outbound_consumer_no_ack, Reason}} ->
+	            {stop, {outbound_link_or_channel_closure, Reason}} ->
     		        rabbit_log_shovel:error("Shovel ~s detected destination shovel failure: ~p", [human_readable_name(Name), Reason]),
     		        {stop, Reason, State};
                 {stop, Reason} ->
@@ -128,8 +128,8 @@ handle_info(Msg, State = #state{config = Config, name = Name}) ->
         {stop, {inbound_conn_died, Reason}} ->
             rabbit_log_shovel:error("Shovel ~s detected source connection failure: ~p", [human_readable_name(Name), Reason]),
             {stop, Reason, State};
-        {stop, {inbound_consumer_no_ack, Reason}} ->
-	        rabbit_log_shovel:error("Shovel ~s detected source shovel failure: ~p", [human_readable_name(Name), Reason]),
+        {stop, {inbound_link_or_channel_closure, Reason}} ->
+	        rabbit_log_shovel:error("Shovel ~s detected source Shovel (or link,  or channel) failure: ~p", [human_readable_name(Name), Reason]),
 	        {stop, Reason, State};
         {stop, Reason} ->
             rabbit_log_shovel:error("Shovel ~s decided to stop due a message from source: ~p", [human_readable_name(Name), Reason]),