yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure the 'inc_sent/1', 'inc_recv/1' to return 'ok'

This commit is contained in:
Feng Lee 2019-11-01 08:09:45 +08:00
parent 30adfc18e6
commit d256387cee
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/emqx_metrics.erl
View File

@ -281,7 +281,7 @@ do_inc_recv(?PUBLISH_PACKET(QoS, _PktId)) ->
?QOS_0 -> inc('messages.qos0.received'); ?QOS_0 -> inc('messages.qos0.received');
?QOS_1 -> inc('messages.qos1.received'); ?QOS_1 -> inc('messages.qos1.received');
?QOS_2 -> inc('messages.qos2.received'); ?QOS_2 -> inc('messages.qos2.received');
_ -> ignore _ -> ok
end, end,
inc('packets.publish.received'); inc('packets.publish.received');
do_inc_recv(?PACKET(?PUBACK)) -> do_inc_recv(?PACKET(?PUBACK)) ->
@ -302,13 +302,12 @@ do_inc_recv(?PACKET(?DISCONNECT)) ->
inc('packets.disconnect.received'); inc('packets.disconnect.received');
do_inc_recv(?PACKET(?AUTH)) -> do_inc_recv(?PACKET(?AUTH)) ->
inc('packets.auth.received'); inc('packets.auth.received');
do_inc_recv(_Packet) -> do_inc_recv(_Packet) -> ok.
ignore.
%% @doc Inc packets sent. Will not count $SYS PUBLISH. %% @doc Inc packets sent. Will not count $SYS PUBLISH.
-spec(inc_sent(emqx_types:packet()) -> ok | ignore). -spec(inc_sent(emqx_types:packet()) -> ok).
inc_sent(?PUBLISH_PACKET(_QoS, <<"$SYS/", _/binary>>, _, _)) -> inc_sent(?PUBLISH_PACKET(_QoS, <<"$SYS/", _/binary>>, _, _)) ->
ignore; ok;
inc_sent(Packet) -> inc_sent(Packet) ->
inc('packets.sent'), inc('packets.sent'),
do_inc_sent(Packet). do_inc_sent(Packet).
@ -349,8 +348,7 @@ do_inc_sent(?PACKET(?DISCONNECT)) ->
inc('packets.disconnect.sent'); inc('packets.disconnect.sent');
do_inc_sent(?PACKET(?AUTH)) -> do_inc_sent(?PACKET(?AUTH)) ->
inc('packets.auth.sent'); inc('packets.auth.sent');
do_inc_sent(_Packet) -> do_inc_sent(_Packet) -> ok.
ignore.
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% gen_server callbacks %% gen_server callbacks