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

Make more normalize

This commit is contained in:
周子博 2018-10-26 17:45:13 +08:00
parent e56252dac6
commit 92251d4a8a
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/emqx_protocol.erl
View File

@ -631,14 +631,14 @@ set_session_attrs({max_inflight, #pstate{zone = Zone, proto_ver = ProtoVer, conn
maps:put(max_inflight, if maps:put(max_inflight, if
ProtoVer =:= ?MQTT_PROTO_V5 -> ProtoVer =:= ?MQTT_PROTO_V5 ->
get_property('Receive-Maximum', ConnProps, 65535); get_property('Receive-Maximum', ConnProps, 65535);
true -> true ->
emqx_zone:get_env(Zone, max_inflight, 65535) emqx_zone:get_env(Zone, max_inflight, 65535)
end, SessAttrs); end, SessAttrs);
set_session_attrs({expiry_interval, #pstate{zone = Zone, proto_ver = ProtoVer, conn_props = ConnProps, clean_start = CleanStart}}, SessAttrs) -> set_session_attrs({expiry_interval, #pstate{zone = Zone, proto_ver = ProtoVer, conn_props = ConnProps, clean_start = CleanStart}}, SessAttrs) ->
maps:put(expiry_interval, if maps:put(expiry_interval, if
ProtoVer =:= ?MQTT_PROTO_V5 -> ProtoVer =:= ?MQTT_PROTO_V5 ->
get_property('Session-Expiry-Interval', ConnProps, 0); get_property('Session-Expiry-Interval', ConnProps, 0);
true -> true ->
case CleanStart of case CleanStart of
true -> 0; true -> 0;
false -> false ->
@ -649,7 +649,7 @@ set_session_attrs({topic_alias_maximum, #pstate{zone = Zone, proto_ver = ProtoVe
maps:put(topic_alias_maximum, if maps:put(topic_alias_maximum, if
ProtoVer =:= ?MQTT_PROTO_V5 -> ProtoVer =:= ?MQTT_PROTO_V5 ->
get_property('Topic-Alias-Maximum', ConnProps, 0); get_property('Topic-Alias-Maximum', ConnProps, 0);
true -> true ->
emqx_zone:get_env(Zone, max_topic_alias, 0) emqx_zone:get_env(Zone, max_topic_alias, 0)
end, SessAttrs); end, SessAttrs);
set_session_attrs({_, #pstate{}}, SessAttrs) -> set_session_attrs({_, #pstate{}}, SessAttrs) ->

2
src/emqx_session.erl
View File

@ -311,7 +311,7 @@ unsubscribe(SPid, PacketId, Properties, TopicFilters) ->
UnsubReq = {PacketId, Properties, TopicFilters}, UnsubReq = {PacketId, Properties, TopicFilters},
gen_server:cast(SPid, {unsubscribe, self(), UnsubReq}). gen_server:cast(SPid, {unsubscribe, self(), UnsubReq}).
-spec(resume(spid(), pid(), emqx:message()) -> ok). -spec(resume(spid(), pid(), emqx:message() | undefined) -> ok).
resume(SPid, ConnPid, WillMsg) -> resume(SPid, ConnPid, WillMsg) ->
gen_server:cast(SPid, {resume, ConnPid, WillMsg}). gen_server:cast(SPid, {resume, ConnPid, WillMsg}).

1
test/emqx_keepalive_SUITE.erl
View File

@ -26,7 +26,6 @@ groups() -> [{keepalive, [], [t_keepalive]}].
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
t_keepalive(_) -> t_keepalive(_) ->
{ok, _} = emqx_keepalive:start(fun() -> {ok, 1} end, 0, {keepalive, timeout}),
{ok, KA} = emqx_keepalive:start(fun() -> {ok, 1} end, 1, {keepalive, timeout}), {ok, KA} = emqx_keepalive:start(fun() -> {ok, 1} end, 1, {keepalive, timeout}),
[resumed, timeout] = lists:reverse(keepalive_recv(KA, [])). [resumed, timeout] = lists:reverse(keepalive_recv(KA, [])).