From 6dcc96f4c8a14e05398a1ee8c4c5ccc7f2fbe778 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Thu, 3 May 2018 20:20:52 +0200
Subject: kernel: Refactor erl_signal_handler startup

---
 lib/kernel/src/erl_signal_handler.erl | 11 ++++++++++-
 lib/kernel/src/kernel.erl             |  8 +-------
 2 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'lib/kernel/src')

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, []};
-- 
cgit v1.2.3


From af60ccf4b2b176ff10a16b5285efbeaf4d16d3af Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Thu, 3 May 2018 20:21:59 +0200
Subject: kernel: Fix comment in kernel_config

The error_logger is no longer added here.
---
 lib/kernel/src/kernel_config.erl | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'lib/kernel/src')

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, [], []).
 
-- 
cgit v1.2.3