summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-07-16 08:28:52 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2012-07-16 08:28:52 +0100
commitb78427551f4a11ee1e83062711629ced04afdfbc (patch)
tree07df578abea7f795cd4de1e5d6565ecef573957b
parent181dd7e5f5c4e78b0473062627bc8a1c8938fbbc (diff)
downloadrabbitmq-server-b78427551f4a11ee1e83062711629ced04afdfbc.tar.gz
refactor: remove gratuitous helper function
-rw-r--r--src/rabbit_reader.erl9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index ee3bf29a..75246007 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -887,8 +887,8 @@ i(SockStat, #v1{sock = Sock}) when SockStat =:= recv_oct;
SockStat =:= send_oct;
SockStat =:= send_cnt;
SockStat =:= send_pend ->
- socket_info(fun () -> rabbit_net:getstat(Sock, [SockStat]) end,
- fun ([{_, I}]) -> I end);
+ socket_info(fun (S) -> rabbit_net:getstat(S, [SockStat]) end,
+ fun ([{_, I}]) -> I end, Sock);
i(state, #v1{connection_state = S}) ->
S;
i(last_blocked_by, #v1{last_blocked_by = By}) ->
@@ -924,10 +924,7 @@ i(Item, #v1{}) ->
throw({bad_argument, Item}).
socket_info(Get, Select, Sock) ->
- socket_info(fun() -> Get(Sock) end, Select).
-
-socket_info(Get, Select) ->
- case Get() of
+ case Get(Sock) of
{ok, T} -> Select(T);
{error, _} -> ''
end.