diff options
author | Lukas Larsson <[email protected]> | 2018-05-15 10:26:02 +0200 |
---|---|---|
committer | Lukas Larsson <[email protected]> | 2018-05-15 10:26:02 +0200 |
commit | 3b3e2f46841e3e86c991be92d62cbb0360ca80e3 (patch) | |
tree | 5fc8a58640a937ca13f0bf8780fd91f87705a8f3 /lib/kernel/src | |
parent | 0c737f730eccd5716b6d87b0ef690fc7ad02d547 (diff) | |
parent | fa4fcc2bb54b6e60a9b9379707a5d30403b011ac (diff) | |
download | otp-3b3e2f46841e3e86c991be92d62cbb0360ca80e3.tar.gz otp-3b3e2f46841e3e86c991be92d62cbb0360ca80e3.tar.bz2 otp-3b3e2f46841e3e86c991be92d62cbb0360ca80e3.zip |
Merge branch 'lukas/erts/otp-21-misc'
* lukas/erts/otp-21-misc:
erts: Fix unused variable warning in unix prim file
erts: Fix erts_os_times warning
kernel: Fix comment in kernel_config
kernel: Refactor erl_signal_handler startup
kernel: Remove doc for unused browser_cmd variable
Diffstat (limited to 'lib/kernel/src')
-rw-r--r-- | lib/kernel/src/erl_signal_handler.erl | 11 | ||||
-rw-r--r-- | lib/kernel/src/kernel.erl | 8 | ||||
-rw-r--r-- | lib/kernel/src/kernel_config.erl | 7 |
3 files changed, 13 insertions, 13 deletions
diff --git a/lib/kernel/src/erl_signal_handler.erl b/lib/kernel/src/erl_signal_handler.erl index 22f235d4e4..b76c2a217a 100644 --- a/lib/kernel/src/erl_signal_handler.erl +++ b/lib/kernel/src/erl_signal_handler.erl @@ -19,12 +19,21 @@ -module(erl_signal_handler). -behaviour(gen_event). --export([init/1, format_status/2, +-export([start/0, init/1, format_status/2, handle_event/2, handle_call/2, handle_info/2, terminate/2, code_change/3]). -record(state,{}). +start() -> + %% add signal handler + case whereis(erl_signal_server) of + %% in case of minimal mode + undefined -> ok; + _ -> + gen_event:add_handler(erl_signal_server, erl_signal_handler, []) + end. + init(_Args) -> {ok, #state{}}. diff --git a/lib/kernel/src/kernel.erl b/lib/kernel/src/kernel.erl index 20aa47f602..ae982c1741 100644 --- a/lib/kernel/src/kernel.erl +++ b/lib/kernel/src/kernel.erl @@ -32,13 +32,7 @@ start(_, []) -> case supervisor:start_link({local, kernel_sup}, kernel, []) of {ok, Pid} -> - %% add signal handler - case whereis(erl_signal_server) of - %% in case of minimal mode - undefined -> ok; - _ -> - ok = gen_event:add_handler(erl_signal_server, erl_signal_handler, []) - end, + ok = erl_signal_handler:start(), %% add error handler case logger:setup_standard_handler() of ok -> {ok, Pid, []}; diff --git a/lib/kernel/src/kernel_config.erl b/lib/kernel/src/kernel_config.erl index 535083ef27..c5ff1887c2 100644 --- a/lib/kernel/src/kernel_config.erl +++ b/lib/kernel/src/kernel_config.erl @@ -30,11 +30,8 @@ %%%----------------------------------------------------------------- %%% This module implements a process that configures the kernel %%% application. -%%% Its purpose is that in the init phase add an error_logger -%%% and when it dies (when the kernel application dies) deleting the -%%% previously installed error_logger. -%%% Also, this process waits for other nodes at startup, if -%%% specified. +%%% Its purpose is that in the init phase waits for other nodes at startup, +%%% if specified. %%%----------------------------------------------------------------- start_link() -> gen_server:start_link(kernel_config, [], []). |