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

AckFun

This commit is contained in:
Feng 2015-10-15 18:59:51 +08:00
parent 7a7afe5995
commit fae3e1e32f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/emqttd_session.erl
View File

@ -170,9 +170,9 @@ destroy(SessPid, ClientId) ->
subscribe(SessPid, TopicTable) -> subscribe(SessPid, TopicTable) ->
subscribe(SessPid, TopicTable, fun(_) -> ok end). subscribe(SessPid, TopicTable, fun(_) -> ok end).
-spec subscribe(pid(), [{binary(), mqtt_qos()}], Callback :: fun()) -> ok. -spec subscribe(pid(), [{binary(), mqtt_qos()}], AckFun :: fun()) -> ok.
subscribe(SessPid, TopicTable, Callback) -> subscribe(SessPid, TopicTable, AckFun) ->
gen_server2:cast(SessPid, {subscribe, TopicTable, Callback}). gen_server2:cast(SessPid, {subscribe, TopicTable, AckFun}).
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------
%% @doc Publish message %% @doc Publish message
@ -296,20 +296,20 @@ handle_call(Req, _From, State) ->
lager:error("Unexpected Request: ~p", [Req]), lager:error("Unexpected Request: ~p", [Req]),
{reply, ok, State}. {reply, ok, State}.
handle_cast({subscribe, TopicTable0, Callback}, Session = #session{ handle_cast({subscribe, TopicTable0, AckFun}, Session = #session{
client_id = ClientId, subscriptions = Subscriptions}) -> client_id = ClientId, subscriptions = Subscriptions}) ->
TopicTable = emqttd_broker:foldl_hooks('client.subscribe', [ClientId], TopicTable0), TopicTable = emqttd_broker:foldl_hooks('client.subscribe', [ClientId], TopicTable0),
case TopicTable -- Subscriptions of case TopicTable -- Subscriptions of
[] -> [] ->
catch Callback([Qos || {_, Qos} <- TopicTable]), catch AckFun([Qos || {_, Qos} <- TopicTable]),
noreply(Session); noreply(Session);
_ -> _ ->
%% subscribe first and don't care if the subscriptions have been existed %% subscribe first and don't care if the subscriptions have been existed
{ok, GrantedQos} = emqttd_pubsub:subscribe(TopicTable), {ok, GrantedQos} = emqttd_pubsub:subscribe(TopicTable),
catch Callback(GrantedQos), catch AckFun(GrantedQos),
emqttd_broker:foreach_hooks('client.subscribe.after', [ClientId, TopicTable]), emqttd_broker:foreach_hooks('client.subscribe.after', [ClientId, TopicTable]),