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

{subscribe, TopicTable}

This commit is contained in:
Feng Lee 2015-06-24 00:37:58 +08:00
parent 34fc0fb157
commit 89c939b321
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/emqttd_ws_client.erl
View File

@ -135,8 +135,8 @@ handle_info({redeliver, {?PUBREL, PacketId}}, #client_state{proto_state = ProtoS
{ok, ProtoState1} = emqttd_protocol:redeliver({?PUBREL, PacketId}, ProtoState), {ok, ProtoState1} = emqttd_protocol:redeliver({?PUBREL, PacketId}, ProtoState),
{noreply, State#client_state{proto_state = ProtoState1}}; {noreply, State#client_state{proto_state = ProtoState1}};
handle_info({subscribe, Topic, Qos}, #client_state{proto_state = ProtoState} = State) -> handle_info({subscribe, TopicTable}, #client_state{proto_state = ProtoState} = State) ->
{ok, ProtoState1} = emqttd_protocol:handle({subscribe, Topic, Qos}, ProtoState), {ok, ProtoState1} = emqttd_protocol:handle({subscribe, TopicTable}, ProtoState),
{noreply, State#client_state{proto_state = ProtoState1}}; {noreply, State#client_state{proto_state = ProtoState1}};
handle_info({stop, duplicate_id, _NewPid}, State=#client_state{proto_state = ProtoState}) -> handle_info({stop, duplicate_id, _NewPid}, State=#client_state{proto_state = ProtoState}) ->
@ -145,7 +145,6 @@ handle_info({stop, duplicate_id, _NewPid}, State=#client_state{proto_state = Pro
handle_info({keepalive, start, TimeoutSec}, State = #client_state{request = Req}) -> handle_info({keepalive, start, TimeoutSec}, State = #client_state{request = Req}) ->
lager:debug("Client(WebSocket) ~s: Start KeepAlive with ~p seconds", [Req:get(peer), TimeoutSec]), lager:debug("Client(WebSocket) ~s: Start KeepAlive with ~p seconds", [Req:get(peer), TimeoutSec]),
%%TODO: fix esockd_transport...
KeepAlive = emqttd_keepalive:new({esockd_transport, Req:get(socket)}, KeepAlive = emqttd_keepalive:new({esockd_transport, Req:get(socket)},
TimeoutSec, {keepalive, timeout}), TimeoutSec, {keepalive, timeout}),
{noreply, State#client_state{keepalive = KeepAlive}}; {noreply, State#client_state{keepalive = KeepAlive}};