aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Bolinder <[email protected]>2019-03-21 13:52:01 +0100
committerHans Bolinder <[email protected]>2019-03-21 13:52:01 +0100
commit949ddf13286ebe10a40f2010d94d238650f6562b (patch)
tree4a09568b3be799207712ee65283dec6d6ee4a206
parentda13166940df546d3fb05a71948f1709d72dd354 (diff)
parent4eee5659d01771417da9ef952274eda359f31c2d (diff)
downloadotp-949ddf13286ebe10a40f2010d94d238650f6562b.tar.gz
otp-949ddf13286ebe10a40f2010d94d238650f6562b.tar.bz2
otp-949ddf13286ebe10a40f2010d94d238650f6562b.zip
Merge branch 'hasse/kernel/global_connect_tries/OTP-15607/ERIERL-280'
* hasse/kernel/global_connect_tries/OTP-15607/ERIERL-280: kernel: Global no longer tries to connect more than once
-rw-r--r--lib/kernel/src/global.erl7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/kernel/src/global.erl b/lib/kernel/src/global.erl
index a38522eb5c..e6490a8130 100644
--- a/lib/kernel/src/global.erl
+++ b/lib/kernel/src/global.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2017. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2019. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
@@ -50,10 +50,9 @@
%% This is for backward compatibility only; the functionality is broken.
-define(WARN_DUPLICATED_NAME, global_multi_name_action).
-%% Undocumented Kernel variable. Set this to 0 (zero) to get the old
-%% behaviour.
+%% Undocumented Kernel variable.
-define(N_CONNECT_RETRIES, global_connect_retries).
--define(DEFAULT_N_CONNECT_RETRIES, 5).
+-define(DEFAULT_N_CONNECT_RETRIES, 0).
%%% In certain places in the server, calling io:format hangs everything,
%%% so we'd better use erlang:display/1.