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

Merge pull request #1109 from emqtt/emq22 

Version 2.2-rc.2
This commit is contained in:
huangdan 2017-06-21 14:48:50 +08:00 committed by GitHub
parent 0067090d6a aacda11244
commit f7522a56b8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emqttd_pool_sup.erl
View File

@ -36,7 +36,7 @@ spec(ChildId, Args) ->
{ChildId, {?MODULE, start_link, Args}, {ChildId, {?MODULE, start_link, Args},
transient, infinity, supervisor, [?MODULE]}. transient, infinity, supervisor, [?MODULE]}.
-spec(start_link(atom(), atom(), mfa()) -> {ok, pid()} | {error, any()}). -spec(start_link(atom() | tuple(), atom(), mfa()) -> {ok, pid()} | {error, any()}).
start_link(Pool, Type, MFA) -> start_link(Pool, Type, MFA) ->
Schedulers = erlang:system_info(schedulers), Schedulers = erlang:system_info(schedulers),
start_link(Pool, Type, Schedulers, MFA). start_link(Pool, Type, Schedulers, MFA).

2
src/emqttd_router.erl
View File

@ -109,7 +109,7 @@ add_route(Topic, Node) when is_binary(Topic), is_atom(Node) ->
add_route(#mqtt_route{topic = Topic, node = Node}). add_route(#mqtt_route{topic = Topic, node = Node}).
%% @doc Add Routes %% @doc Add Routes
-spec(add_routes([mqtt_route()]) -> ok | {errory, Reason :: any()}). -spec(add_routes([mqtt_route()]) -> ok | {error, Reason :: any()}).
add_routes(Routes) -> add_routes(Routes) ->
AddFun = fun() -> [add_route_(Route) || Route <- Routes] end, AddFun = fun() -> [add_route_(Route) || Route <- Routes] end,
case mnesia:is_transaction() of case mnesia:is_transaction() of