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

Merge branch 'emqx32' into subscription-sharding

This commit is contained in:
Feng Lee 2018-12-10 10:08:18 +08:00 committed by GitHub
parent 5164d0d6a5 64f62fa0ce
commit fb7b63c59b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/emqx_broker.erl
View File

@ -34,6 +34,11 @@
-export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2,
code_change/3]). code_change/3]).
-ifdef(TEST).
-compile(export_all).
-compile(nowarn_export_all).
-endif.
-define(BROKER, ?MODULE). -define(BROKER, ?MODULE).
%% ETS tables %% ETS tables

2
src/emqx_hooks.erl
View File

@ -42,7 +42,7 @@
-spec(start_link() -> emqx_types:startlink_ret()). -spec(start_link() -> emqx_types:startlink_ret()).
start_link() -> start_link() ->
gen_server:start_link({local, ?SERVER}, ?MODULE, [], [{hibernate_after, 60000}]). gen_server:start_link({local, ?SERVER}, ?MODULE, [], [{hibernate_after, 1000}]).
-spec(stop() -> ok). -spec(stop() -> ok).
stop() -> stop() ->

3
src/emqx_pool.erl
View File

@ -35,7 +35,8 @@ start_link() ->
%% @doc Start pool. %% @doc Start pool.
-spec(start_link(atom(), pos_integer()) -> emqx_types:startlink_ret()). -spec(start_link(atom(), pos_integer()) -> emqx_types:startlink_ret()).
start_link(Pool, Id) -> start_link(Pool, Id) ->
gen_server:start_link({local, emqx_misc:proc_name(?MODULE, Id)}, ?MODULE, [Pool, Id], []). gen_server:start_link({local, emqx_misc:proc_name(?MODULE, Id)},
?MODULE, [Pool, Id], [{hibernate_after, 1000}]).
%% @doc Submit work to the pool. %% @doc Submit work to the pool.
-spec(submit(task()) -> any()). -spec(submit(task()) -> any()).