Use rabbit_misc:pget/2 here

2 files changed, 17 insertions, 14 deletions

diff --git a/src/rabbit_connection_tracking.erl b/src/rabbit_connection_tracking.erl
index 17e2d79034..5e8c4415d3 100644
--- a/src/rabbit_connection_tracking.erl
+++ b/src/rabbit_connection_tracking.erl
@@ -40,6 +40,8 @@
 
 -include_lib("rabbit.hrl").
 
+-import(rabbit_misc, [pget/2]).
+
 %%
 %% API
 %%
@@ -280,17 +282,17 @@ tracked_connection_from_connection_created(EventDetails) ->
     %%       {<<"information">>,longstr,
     %%        <<"http://rubybunny.info">>}]},
     %%  {connected_at,1453214290847}]
-    Name = proplists:get_value(name, EventDetails),
-    Node = proplists:get_value(node, EventDetails),
+    Name = pget(name, EventDetails),
+    Node = pget(node, EventDetails),
     #tracked_connection{id           = {Node, Name},
                         name         = Name,
                         node         = Node,
-                        vhost        = proplists:get_value(vhost, EventDetails),
-                        username     = proplists:get_value(user, EventDetails),
-                        connected_at = proplists:get_value(connected_at, EventDetails),
-                        pid          = proplists:get_value(pid, EventDetails),
-                        peer_host    = proplists:get_value(peer_host, EventDetails),
-                        peer_port    = proplists:get_value(peer_port, EventDetails)}.
+                        vhost        = pget(vhost, EventDetails),
+                        username     = pget(user, EventDetails),
+                        connected_at = pget(connected_at, EventDetails),
+                        pid          = pget(pid, EventDetails),
+                        peer_host    = pget(peer_host, EventDetails),
+                        peer_port    = pget(peer_port, EventDetails)}.
 
 tracked_connection_from_connection_state(#connection{
                vhost = VHost,
diff --git a/src/rabbit_connection_tracking_handler.erl b/src/rabbit_connection_tracking_handler.erl
index 3fda7e9797..404d84f69b 100644
--- a/src/rabbit_connection_tracking_handler.erl
+++ b/src/rabbit_connection_tracking_handler.erl
@@ -28,6 +28,7 @@
          terminate/2, code_change/3]).
 
 -include_lib("rabbit.hrl").
+-import(rabbit_misc, [pget/2]).
 
 -rabbit_boot_step({?MODULE,
                    [{description, "connection tracking event handler"},
@@ -48,7 +49,7 @@ init([]) ->
 
 handle_event(#event{type = connection_created, props = Details}, State) ->
     ThisNode = node(),
-    case proplists:get_value(node, Details) of
+    case pget(node, Details) of
       ThisNode ->
           rabbit_connection_tracking:register_connection(
             rabbit_connection_tracking:tracked_connection_from_connection_created(Details)
@@ -60,27 +61,27 @@ handle_event(#event{type = connection_created, props = Details}, State) ->
     {ok, State};
 handle_event(#event{type = connection_closed, props = Details}, State) ->
     ThisNode = node(),
-    case proplists:get_value(node, Details) of
+    case pget(node, Details) of
       ThisNode ->
           %% [{name,<<"127.0.0.1:64078 -> 127.0.0.1:5672">>},
           %%  {pid,<0.1774.0>},
           %%  {node, rabbit@hostname}]
           rabbit_connection_tracking:unregister_connection(
-            {proplists:get_value(node, Details),
-             proplists:get_value(name, Details)});
+            {pget(node, Details),
+             pget(name, Details)});
       _OtherNode ->
         %% ignore
         ok
     end,
     {ok, State};
 handle_event(#event{type = vhost_deleted, props = Details}, State) ->
-    VHost = proplists:get_value(name, Details),
+    VHost = pget(name, Details),
     rabbit_log_connection:info("Closing all connections in vhost '~s' because it's being deleted", [VHost]),
     [rabbit_networking:close_connection(Pid, rabbit_misc:format("vhost '~s' is deleted", [VHost])) ||
       #tracked_connection{pid = Pid} <- rabbit_connection_tracking:list(VHost)],
         {ok, State};
 handle_event(#event{type = user_deleted, props = Details}, State) ->
-    _Username = proplists:get_value(name, Details),
+    _Username = pget(name, Details),
     %% TODO: force close and unregister connections from
     %%       this user. Moved to rabbitmq/rabbitmq-server#628.
     {ok, State};