Merge pull request #3506 from Ayanda-D/redundant-code

Remove redundant code in internal auth backend and queue consumers modules

(cherry picked from commit c78b04307bf87eb604ebe6b19abefaa9d22984dc)

2 files changed, 18 insertions, 51 deletions

diff --git a/deps/rabbit/src/rabbit_auth_backend_internal.erl b/deps/rabbit/src/rabbit_auth_backend_internal.erl
index 96c1a620b7..d94526270a 100644
--- a/deps/rabbit/src/rabbit_auth_backend_internal.erl
+++ b/deps/rabbit/src/rabbit_auth_backend_internal.erl
@@ -234,12 +234,9 @@ add_user_sans_validation(Username, Password, ActingUser) ->
         throw:{error, {user_already_exists, _}} = Error ->
             rabbit_log:warning("Failed to add user '~s': the user already exists", [Username]),
             throw(Error);
-        throw:Error ->
+        Class:Error ->
             rabbit_log:warning("Failed to add user '~s': ~p", [Username, Error]),
-            throw(Error);
-        exit:Error ->
-            rabbit_log:warning("Failed to add user '~s': ~p", [Username, Error]),
-            exit(Error)
+            erlang:Class(Error)
     end .
 
 -spec delete_user(rabbit_types:username(), rabbit_types:username()) -> 'ok'.
@@ -275,12 +272,9 @@ delete_user(Username, ActingUser) ->
         throw:{error, {no_such_user, _}} = Error ->
             rabbit_log:warning("Failed to delete user '~s': the user does not exist", [Username]),
             throw(Error);
-        throw:Error ->
-            rabbit_log:warning("Failed to delete user '~s': ~p", [Username, Error]),
-            throw(Error);
-        exit:Error ->
+        Class:Error ->
             rabbit_log:warning("Failed to delete user '~s': ~p", [Username, Error]),
-            exit(Error)
+            erlang:Class(Error)
     end .
 
 -spec lookup_user
@@ -323,12 +317,9 @@ change_password_sans_validation(Username, Password, ActingUser) ->
         throw:{error, {no_such_user, _}} = Error ->
             rabbit_log:warning("Failed to change password for user '~s': the user does not exist", [Username]),
             throw(Error);
-        throw:Error ->
-            rabbit_log:warning("Failed to change password for user '~s': ~p", [Username, Error]),
-            throw(Error);
-        exit:Error ->
+        Class:Error ->
             rabbit_log:warning("Failed to change password for user '~s': ~p", [Username, Error]),
-            exit(Error)
+            erlang:Class(Error)
     end.
 
 -spec clear_password(rabbit_types:username(), rabbit_types:username()) -> 'ok'.
@@ -377,12 +368,9 @@ set_tags(Username, Tags, ActingUser) ->
         throw:{error, {no_such_user, _}} = Error ->
             rabbit_log:warning("Failed to set tags for user '~s': the user does not exist", [Username]),
             throw(Error);
-        throw:Error ->
+        Class:Error ->
             rabbit_log:warning("Failed to set tags for user '~s': ~p", [Username, Error]),
-            throw(Error);
-        exit:Error ->
-            rabbit_log:warning("Failed to set tags for user '~s': ~p", [Username, Error]),
-            exit(Error)
+            erlang:Class(Error)
     end .
 
 -spec set_permissions
@@ -440,14 +428,10 @@ set_permissions(Username, VirtualHost, ConfigurePerm, WritePerm, ReadPerm, Actin
             rabbit_log:warning("Failed to set permissions for '~s': the user does not exist",
                                [Username]),
             throw(Error);
-        throw:Error ->
-            rabbit_log:warning("Failed to set permissions for '~s' in virtual host '~s': ~p",
-                               [Username, VirtualHost, Error]),
-            throw(Error);
-        exit:Error ->
+        Class:Error ->
             rabbit_log:warning("Failed to set permissions for '~s' in virtual host '~s': ~p",
                                [Username, VirtualHost, Error]),
-            exit(Error)
+            erlang:Class(Error)
     end.
 
 -spec clear_permissions
@@ -480,14 +464,10 @@ clear_permissions(Username, VirtualHost, ActingUser) ->
             rabbit_log:warning("Failed to clear permissions for '~s': the user does not exist",
                                [Username]),
             throw(Error);
-        throw:Error ->
+        Class:Error ->
             rabbit_log:warning("Failed to clear permissions for '~s' in virtual host '~s': ~p",
                                [Username, VirtualHost, Error]),
-            throw(Error);
-        exit:Error ->
-            rabbit_log:warning("Failed to clear permissions for '~s' in virtual host '~s': ~p",
-                               [Username, VirtualHost, Error]),
-            exit(Error)
+            erlang:Class(Error)
     end.
 
 
@@ -557,14 +537,10 @@ set_topic_permissions(Username, VirtualHost, Exchange, WritePerm, ReadPerm, Acti
             rabbit_log:warning("Failed to set topic permissions on exchange '~s' for '~s': the user does not exist.",
                                [Exchange, Username]),
             throw(Error);
-        throw:Error ->
-            rabbit_log:warning("Failed to set topic permissions on exchange '~s' for '~s' in virtual host '~s': ~p.",
-                               [Exchange, Username, VirtualHost, Error]),
-            throw(Error);
-        exit:Error ->
+        Class:Error ->
             rabbit_log:warning("Failed to set topic permissions on exchange '~s' for '~s' in virtual host '~s': ~p.",
                                [Exchange, Username, VirtualHost, Error]),
-            exit(Error)
+            erlang:Class(Error)
     end .
 
 clear_topic_permissions(Username, VirtualHost, ActingUser) ->
@@ -596,14 +572,10 @@ clear_topic_permissions(Username, VirtualHost, ActingUser) ->
             rabbit_log:warning("Failed to clear topic permissions for '~s': the user does not exist",
                                [Username]),
             throw(Error);
-        throw:Error ->
+        Class:Error ->
             rabbit_log:warning("Failed to clear topic permissions for '~s' in virtual host '~s': ~p",
                                [Username, VirtualHost, Error]),
-            throw(Error);
-        exit:Error ->
-            rabbit_log:warning("Failed to clear topic permissions for '~s' in virtual host '~s': ~p",
-                               [Username, VirtualHost, Error]),
-            exit(Error)
+            erlang:Class(Error)
     end.
 
 clear_topic_permissions(Username, VirtualHost, Exchange, ActingUser) ->
@@ -637,14 +609,10 @@ clear_topic_permissions(Username, VirtualHost, Exchange, ActingUser) ->
             rabbit_log:warning("Failed to clear topic permissions on exchange '~s' for '~s': the user does not exist",
                                [Exchange, Username]),
             throw(Error);
-        throw:Error ->
-            rabbit_log:warning("Failed to clear topic permissions on exchange '~s' for '~s' in virtual host '~s': ~p",
-                               [Exchange, Username, VirtualHost, Error]),
-            throw(Error);
-        exit:Error ->
+        Class:Error ->
             rabbit_log:warning("Failed to clear topic permissions on exchange '~s' for '~s' in virtual host '~s': ~p",
                                [Exchange, Username, VirtualHost, Error]),
-            exit(Error)
+            erlang:Class(Error)
     end.
 
 put_user(User, ActingUser) -> put_user(User, undefined, ActingUser).
diff --git a/deps/rabbit/src/rabbit_queue_consumers.erl b/deps/rabbit/src/rabbit_queue_consumers.erl
index c5a62ea677..83538bd5f5 100644
--- a/deps/rabbit/src/rabbit_queue_consumers.erl
+++ b/deps/rabbit/src/rabbit_queue_consumers.erl
@@ -221,7 +221,6 @@ deliver(FetchFun, QName, false, State = #state{consumers = Consumers}, true, Sin
                 {delivered, R} ->
                     {delivered, false, R, State};
                 undelivered ->
-                    {ChPid, Consumer} = SingleActiveConsumer,
                     Consumers1 = remove_consumer(ChPid, Consumer#consumer.tag, Consumers),
                     {undelivered, true,
                         State#state{consumers = Consumers1, use = update_use(State#state.use, inactive)}}