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

Merge pull request #1096 from emqtt/develop 

Fix the race condition issue caused by unregister_session/1
This commit is contained in:
turtleDeng 2017-06-12 21:52:55 +08:00 committed by GitHub
parent f0804df014 53f5188cbb
commit 0ec1f0ccf9
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/emqttd_sm.erl
View File

@ -33,7 +33,8 @@
%% API Function Exports %% API Function Exports
-export([start_link/2]). -export([start_link/2]).
-export([start_session/2, lookup_session/1, register_session/3, unregister_session/1]). -export([start_session/2, lookup_session/1, register_session/3,
unregister_session/1, unregister_session/2]).
-export([dispatch/3]). -export([dispatch/3]).
@ -99,9 +100,17 @@ register_session(ClientId, CleanSess, Properties) ->
ets:insert(mqtt_local_session, {ClientId, self(), CleanSess, Properties}). ets:insert(mqtt_local_session, {ClientId, self(), CleanSess, Properties}).
%% @doc Unregister a session. %% @doc Unregister a session.
-spec(unregister_session(binary()) -> true). -spec(unregister_session(binary()) -> boolean()).
unregister_session(ClientId) -> unregister_session(ClientId) ->
ets:delete(mqtt_local_session, ClientId). unregister_session(ClientId, self()).
unregister_session(ClientId, Pid) ->
case ets:lookup(mqtt_local_session, ClientId) of
[LocalSess = {_, Pid, _, _}] ->
ets:delete_object(mqtt_local_session, LocalSess);
_ ->
false
end.
dispatch(ClientId, Topic, Msg) -> dispatch(ClientId, Topic, Msg) ->
try ets:lookup_element(mqtt_local_session, ClientId, 2) of try ets:lookup_element(mqtt_local_session, ClientId, 2) of