From 7fe3d59c282ba2f591e8f2fa018e3313f9f170df Mon Sep 17 00:00:00 2001 From: Feng Lee Date: Thu, 13 Dec 2018 17:25:50 +0800 Subject: [PATCH] Update the registered name of pool sup. --- src/emqx_broker_sup.erl | 4 ++-- src/emqx_pool_sup.erl | 3 ++- src/emqx_router_sup.erl | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/emqx_broker_sup.erl b/src/emqx_broker_sup.erl index a511e4154..f60a2a1b2 100644 --- a/src/emqx_broker_sup.erl +++ b/src/emqx_broker_sup.erl @@ -30,8 +30,8 @@ start_link() -> init([]) -> %% Broker pool PoolSize = emqx_vm:schedulers() * 2, - BrokerPool = emqx_pool_sup:spec(emqx_broker_pool, - [broker, hash, PoolSize, + BrokerPool = emqx_pool_sup:spec(broker_pool, + [emqx_broker_pool, hash, PoolSize, {emqx_broker, start_link, []}]), %% Shared subscription SharedSub = #{id => shared_sub, diff --git a/src/emqx_pool_sup.erl b/src/emqx_pool_sup.erl index b371549c0..e11fa01f2 100644 --- a/src/emqx_pool_sup.erl +++ b/src/emqx_pool_sup.erl @@ -37,7 +37,8 @@ spec(ChildId, Args) -> start_link(Pool, Type, MFA) -> start_link(Pool, Type, emqx_vm:schedulers(), MFA). --spec(start_link(atom() | tuple(), atom(), pos_integer(), mfa()) -> {ok, pid()} | {error, term()}). +-spec(start_link(atom() | tuple(), atom(), pos_integer(), mfa()) + -> {ok, pid()} | {error, term()}). start_link(Pool, Type, Size, MFA) when is_atom(Pool) -> supervisor:start_link({local, Pool}, ?MODULE, [Pool, Type, Size, MFA]); start_link(Pool, Type, Size, MFA) -> diff --git a/src/emqx_router_sup.erl b/src/emqx_router_sup.erl index 2bbaabc18..c0317fc78 100644 --- a/src/emqx_router_sup.erl +++ b/src/emqx_router_sup.erl @@ -32,8 +32,8 @@ init([]) -> modules => [emqx_router_helper]}, %% Router pool - RouterPool = emqx_pool_sup:spec(emqx_router_pool, - [router, hash, emqx_vm:schedulers(), + RouterPool = emqx_pool_sup:spec(router_pool, + [emqx_router_pool, hash, emqx_vm:schedulers(), {emqx_router, start_link, []}]), {ok, {{one_for_all, 0, 1}, [Helper, RouterPool]}}.