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

forced subscriptions

This commit is contained in:
Feng Lee 2015-05-23 00:20:58 +08:00
parent c865fd2b6e
commit 01bfb830f5
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/emqttd/src/emqttd_protocol.erl
View File

@ -217,7 +217,7 @@ handle(?SUBSCRIBE_PACKET(PacketId, TopicTable), State = #proto_state{clientid =
send(?SUBACK_PACKET(PacketId, GrantedQos), State#proto_state{session = NewSession}) send(?SUBACK_PACKET(PacketId, GrantedQos), State#proto_state{session = NewSession})
end; end;
handle({subscribe, Topic, Qos}, State = #proto_state{clientid = ClientId, session = Session}) -> handle({subscribe, Topic, Qos}, State = #proto_state{session = Session}) ->
{ok, NewSession, _GrantedQos} = emqttd_session:subscribe(Session, [{Topic, Qos}]), {ok, NewSession, _GrantedQos} = emqttd_session:subscribe(Session, [{Topic, Qos}]),
{ok, State#proto_state{session = NewSession}}; {ok, State#proto_state{session = NewSession}};
@ -300,12 +300,8 @@ send_willmsg(ClientId, WillMsg) ->
%%TODO: will be fixed in 0.8 %%TODO: will be fixed in 0.8
force_subscribe(ClientId) -> force_subscribe(ClientId) ->
case emqttd_broker:env(forced_subscriptions) of [force_subscribe(ClientId, {Topic, Qos}) || {Topic, Qos} <-
undefined -> proplists:get_value(forced_subscriptions, emqttd:env(mqtt, client), [])].
ingore;
Topics ->
[force_subscribe(ClientId, {Topic, Qos}) || {Topic, Qos} <- Topics]
end.
force_subscribe(ClientId, {Topic, Qos}) when is_list(Topic) -> force_subscribe(ClientId, {Topic, Qos}) when is_list(Topic) ->
force_subscribe(ClientId, {list_to_binary(Topic), Qos}); force_subscribe(ClientId, {list_to_binary(Topic), Qos});
@ -315,6 +311,7 @@ force_subscribe(ClientId, {Topic, Qos}) when is_binary(Topic) ->
self() ! {force_subscribe, Topic1, Qos}. self() ! {force_subscribe, Topic1, Qos}.
start_keepalive(0) -> ignore; start_keepalive(0) -> ignore;
start_keepalive(Sec) when Sec > 0 -> start_keepalive(Sec) when Sec > 0 ->
self() ! {keepalive, start, round(Sec * 1.5)}. self() ! {keepalive, start, round(Sec * 1.5)}.