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

Merge branch 'emqx30' of github.com:emqtt/emqttd into emqx30

This commit is contained in:
Feng Lee 2018-08-26 16:25:02 +08:00
parent 0e3728c940 ee11627828
commit 397179bbda
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/emqx.erl
View File

@ -71,12 +71,18 @@ subscribe(Topic) ->
emqx_broker:subscribe(iolist_to_binary(Topic)).
-spec(subscribe(topic() | string(), subscriber() | string()) -> ok | {error, term()}).
subscribe(Topic, Subscriber) ->
emqx_broker:subscribe(iolist_to_binary(Topic), list_to_subid(Subscriber)).
subscribe(Topic, Sub) when is_list(Sub)->
emqx_broker:subscribe(iolist_to_binary(Topic), list_to_subid(Sub));
subscribe(Topic, Subscriber) when is_tuple(Subscriber) ->
{SubPid, SubId} = Subscriber,
emqx_broker:subscribe(iolist_to_binary(Topic), SubPid, SubId).
-spec(subscribe(topic() | string(), subscriber() | string(), subopts()) -> ok | {error, term()}).
subscribe(Topic, Subscriber, Options) ->
emqx_broker:subscribe(iolist_to_binary(Topic), list_to_subid(Subscriber), Options).
subscribe(Topic, Sub, Options) when is_list(Sub)->
emqx_broker:subscribe(iolist_to_binary(Topic), list_to_subid(Sub), Options);
subscribe(Topic, Subscriber, Options) when is_tuple(Subscriber)->
{SubPid, SubId} = Subscriber,
emqx_broker:subscribe(iolist_to_binary(Topic), SubPid, SubId, Options).
%% @doc Publish Message
-spec(publish(message()) -> {ok, delivery()} | {error, term()}).
@ -123,11 +129,7 @@ list_to_subid(SubId) when is_binary(SubId) ->
list_to_subid(SubId) when is_list(SubId) ->
iolist_to_binary(SubId);
list_to_subid(SubPid) when is_pid(SubPid) ->
SubPid;
list_to_subid({SubId, SubPid}) when is_binary(SubId), is_pid(SubPid) ->
{SubId, SubPid};
list_to_subid({SubId, SubPid}) when is_list(SubId), is_pid(SubPid) ->
{iolist_to_binary(SubId), SubPid}.
SubPid.
%%--------------------------------------------------------------------
%% Hooks API

2
src/emqx_broker.erl
View File

@ -68,8 +68,6 @@ subscribe(Topic, SubId) when is_binary(Topic), ?is_subid(SubId) ->
subscribe(Topic, self(), SubId).
-spec(subscribe(topic(), pid() | subid(), subid() | subopts()) -> ok).
subscribe(Topic, SubPid, SubId) when is_binary(Topic), is_pid(SubPid), ?is_subid(SubId) ->
subscribe(Topic, SubPid, SubId, #{});
subscribe(Topic, SubPid, SubId) when is_binary(Topic), is_pid(SubPid), ?is_subid(SubId) ->
subscribe(Topic, SubPid, SubId, #{});
subscribe(Topic, SubPid, SubOpts) when is_binary(Topic), is_pid(SubPid), is_map(SubOpts) ->