diff options
| author | Sverker Eriksson <[email protected]> | 2017-08-16 16:56:12 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-11-15 20:10:33 +0100 |
| commit | 3dda5298322a76f2787c6c4dd1cce78416c20dc3 (patch) | |
| tree | f5068c842e9df17a84933bd857f5a3d8702e7c83 /erts/preloaded/src | |
| parent | f89fb92384280e2939414287a2ecb8f86a199318 (diff) | |
| download | otp-3dda5298322a76f2787c6c4dd1cce78416c20dc3.tar.gz otp-3dda5298322a76f2787c6c4dd1cce78416c20dc3.tar.bz2 otp-3dda5298322a76f2787c6c4dd1cce78416c20dc3.zip | |
erts: Async auto-connect for monitor_node
Removed distribution_SUITE:applied_monitor_node
as it seems to test apply of trapping BIF
and monitor_node does not trap anymore.
Diffstat (limited to 'erts/preloaded/src')
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl index 28625c400f..9630c0c934 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -3304,12 +3304,10 @@ dunlink(Pid) -> false -> true end. -dmonitor_node(Node, Flag, []) -> - case net_kernel:connect(Node) of - true -> erlang:monitor_node(Node, Flag, []); - false -> erlang:self() ! {nodedown, Node}, true - end; - +dmonitor_node(Node, _Flag, []) -> + %% Only called when auto-connect attempt failed early in VM + erlang:self() ! {nodedown, Node}, + true; dmonitor_node(Node, Flag, Opts) -> case lists:member(allow_passive_connect, Opts) of true -> |