diff options
| author | Siri Hansen <[email protected]> | 2019-01-10 16:33:04 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2019-01-16 09:59:24 +0100 |
| commit | 48cb63e5ba6ca42c180e6471f393254acfe322ec (patch) | |
| tree | deb03f121d7b0f428461f5e6200d946cee82e7ab /lib/kernel/src/logger.erl | |
| parent | b387ef2366f92417bcec81e461539844750fc18a (diff) | |
| download | otp-48cb63e5ba6ca42c180e6471f393254acfe322ec.tar.gz otp-48cb63e5ba6ca42c180e6471f393254acfe322ec.tar.bz2 otp-48cb63e5ba6ca42c180e6471f393254acfe322ec.zip | |
[logger] Store proxy config in logger ets table
This is to ensure that logger_proxy gets the same config after a
restart.
Diffstat (limited to 'lib/kernel/src/logger.erl')
| -rw-r--r-- | lib/kernel/src/logger.erl | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/lib/kernel/src/logger.erl b/lib/kernel/src/logger.erl index f05e756fd0..abdd9a9ceb 100644 --- a/lib/kernel/src/logger.erl +++ b/lib/kernel/src/logger.erl @@ -438,11 +438,8 @@ set_handler_config(HandlerId,Config) -> -spec set_proxy_config(Config) -> ok | {error,term()} when Config :: olp_config(). -set_proxy_config(Config) when is_map(Config) -> - Defaults = logger_proxy:get_default_config(), - logger_olp:set_opts(logger_proxy,maps:merge(Defaults,Config)); set_proxy_config(Config) -> - {error,{invalid_config,Config}}. + logger_server:set_config(proxy,Config). -spec update_primary_config(Config) -> ok | {error,term()} when Config :: primary_config(). @@ -480,10 +477,8 @@ update_handler_config(HandlerId,Config) -> -spec update_proxy_config(Config) -> ok | {error,term()} when Config :: olp_config(). -update_proxy_config(Config) when is_map(Config) -> - logger_olp:set_opts(logger_proxy,Config); update_proxy_config(Config) -> - {error,{invalid_config,Config}}. + logger_server:update_config(proxy,Config). -spec get_primary_config() -> Config when Config :: primary_config(). @@ -521,7 +516,8 @@ get_handler_ids() -> -spec get_proxy_config() -> Config when Config :: olp_config(). get_proxy_config() -> - logger_olp:get_opts(logger_proxy). + {ok,Config} = logger_config:get(?LOGGER_TABLE,proxy), + Config. -spec update_formatter_config(HandlerId,FormatterConfig) -> ok | {error,term()} when @@ -717,7 +713,7 @@ add_handlers(kernel) -> undefined -> add_handlers(kernel,Env); Opts -> - case logger_olp:set_opts(logger_proxy,Opts) of + case set_proxy_config(Opts) of ok -> add_handlers(kernel,Env); {error, Reason} -> {error,{bad_proxy_config,Reason}} end |