refactor

Author: ansd

deps/rabbit/src/rabbit_amqp_session.erl

@@ -3980,7 +3980,7 @@ is_valid_max(Val) ->
 list_local() ->
     pg:which_groups(pg_scope()).
 
-%% Returns 'true' if Pid is a local AMQP session process.
+%% Returns true if Pid is a local AMQP session process.
 -spec is_local(pid()) -> boolean().
 is_local(Pid) ->
     pg:get_local_members(pg_scope(), Pid) =/= [].

deps/rabbit/src/rabbit_channel.erl

@@ -557,14 +557,6 @@ handle_call({{info, Items}, Deadline}, _From, State) ->
             reply({error, Error}, State)
     end;
 
-handle_call(refresh_config, _From,
-            State = #ch{cfg = #conf{virtual_host = VHost} = Cfg}) ->
-    reply(ok, State#ch{cfg = Cfg#conf{trace_state = rabbit_trace:init(VHost)}});
-
-handle_call(refresh_interceptors, _From, State) ->
-    IState = rabbit_channel_interceptor:init(State),
-    reply(ok, State#ch{interceptor_state = IState});
-
 handle_call({has_state, #resource{virtual_host = Vhost,
                                   name = Name}, rabbit_volatile_queue},
             _From,
@@ -588,6 +580,14 @@ handle_call({declare_fast_reply_to, Key}, _From, State = #ch{direct_reply = Repl
              end,
     reply(Result, State);
 
+handle_call(refresh_config, _From,
+            State = #ch{cfg = #conf{virtual_host = VHost} = Cfg}) ->
+    reply(ok, State#ch{cfg = Cfg#conf{trace_state = rabbit_trace:init(VHost)}});
+
+handle_call(refresh_interceptors, _From, State) ->
+    IState = rabbit_channel_interceptor:init(State),
+    reply(ok, State#ch{interceptor_state = IState});
+
 handle_call(list_queue_states, _From, State = #ch{queue_states = QueueStates}) ->
     %% For testing of cleanup only
     %% HACK

deps/rabbit/src/rabbit_volatile_queue.erl

@@ -202,42 +202,32 @@ deliver0(Q, Msg) ->
 
 -spec deliver_local(pid(), rabbit_amqqueue:name(), mc:state()) -> ok.
 deliver_local(Pid, QName, Msg) ->
-    Evt = {queue_event, QName, {deliver, Msg}},
     %% We ensure clients can't use this mechanism to send a message
     %% to an arbitrary process and kill it.
     case rabbit_amqp_session:is_local(Pid) orelse
          pg_local:in_group(rabbit_channels, Pid) of
         true ->
-            gen_server:cast(Pid, Evt);
+            gen_server:cast(Pid, {queue_event, QName, {deliver, Msg}});
         false ->
             ok
     end.
 
 handle_event(QName, {deliver, Msg}, #?STATE{name = QName,
                                             ctag = Ctag,
                                             credit = undefined} = State) ->
-    Actions = deliver_actions(QName, Ctag, Msg),
-    {ok, State, Actions};
+    {ok, State, deliver_actions(QName, Ctag, Msg)};
 handle_event(QName, {deliver, Msg}, #?STATE{name = QName,
                                             ctag = Ctag,
                                             delivery_count = DeliveryCount,
-                                            credit = Credit,
-                                            dropped = Dropped} = State0) ->
-    {DC, C, D, Actions} = case Credit > 0 of
-                              true ->
-                                  {serial_number:add(DeliveryCount, 1),
-                                   Credit - 1,
-                                   Dropped,
-                                   deliver_actions(QName, Ctag, Msg)};
-                              false ->
-                                  rabbit_global_counters:messages_dead_lettered(
-                                    maxlen, ?MODULE, disabled, 1),
-                                  {DeliveryCount, Credit, Dropped + 1, []}
-                          end,
-    State = State0#?STATE{delivery_count = DC,
-                          credit = C,
-                          dropped = D},
-    {ok, State, Actions}.
+                                            credit = Credit} = State0)
+  when Credit > 0 ->
+    State = State0#?STATE{delivery_count = serial_number:add(DeliveryCount, 1),
+                          credit = Credit - 1},
+    {ok, State, deliver_actions(QName, Ctag, Msg)};
+handle_event(QName, {deliver, _Msg}, #?STATE{name = QName,
+                                             dropped = Dropped} = State) ->
+    rabbit_global_counters:messages_dead_lettered(maxlen, ?MODULE, disabled, 1),
+    {ok, State#?STATE{dropped = Dropped + 1}, []}.
 
 deliver_actions(QName, Ctag, Mc) ->
     Msgs = [{QName, self(), undefined, _Redelivered = false, Mc}],