Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:Ledest:erlang:23
erlang
5573-kernel-Change-net_kernel-get_state-0-name_...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 5573-kernel-Change-net_kernel-get_state-0-name_domain-val.patch of Package erlang
From 0b665a2cbc2794d459242a079e95298adc9745bc Mon Sep 17 00:00:00 2001 From: Sverker Eriksson <sverker@erlang.org> Date: Mon, 21 Feb 2022 17:39:10 +0100 Subject: [PATCH 3/3] kernel: Change net_kernel:get_state/0 name_domain values from short|long to shortnames | longnames to be consistent with net_kernel:start. --- lib/kernel/doc/src/net_kernel.xml | 6 +++--- lib/kernel/src/net_kernel.erl | 6 +++--- lib/kernel/test/erl_distribution_SUITE.erl | 20 ++++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/kernel/doc/src/net_kernel.xml b/lib/kernel/doc/src/net_kernel.xml index 76eb0ad7ec..f56d95f094 100644 --- a/lib/kernel/doc/src/net_kernel.xml +++ b/lib/kernel/doc/src/net_kernel.xml @@ -154,7 +154,7 @@ $ <input>erl -sname foobar</input></pre> <fsummary>Get various distribution state.</fsummary> <desc> <p>Get the current state of the distribution for the local node.</p> - <p>Returns a map with (at least) the following key-vale pairs:</p> + <p>Returns a map with (at least) the following key-value pairs:</p> <taglist> <tag><c>started => Started</c></tag> <item> @@ -210,12 +210,12 @@ $ <input>erl -sname foobar</input></pre> <item> <p>Valid values for <c>NameDomain</c>:</p> <taglist> - <tag><c>short</c></tag> + <tag><c>shortnames</c></tag> <item> <p>The distribution was started to use node names with a short host portion (not fully qualified).</p> </item> - <tag><c>long</c></tag> + <tag><c>longnames</c></tag> <item> <p>The distribution was started to use node names with a long fully qualified host portion.</p> diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl index 3a819eb4d5..76279327b2 100644 --- a/lib/kernel/src/net_kernel.erl +++ b/lib/kernel/src/net_kernel.erl @@ -199,7 +199,7 @@ nodename() -> request(nodename). -spec get_state() -> #{started => no | static | dynamic, name => atom(), name_type => static | dynamic, - name_domain => short | long}. + name_domain => shortnames | longnames}. get_state() -> case whereis(net_kernel) of undefined -> @@ -866,8 +866,8 @@ handle_call(get_state, From, State) -> {dynamic, Node} end, NameDomain = case get(longnames) of - true -> long; - false -> short + true -> longnames; + false -> shortnames end, Return = #{started => Started, name_type => NameType, diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl index 551b1f39dc..ad1b415bc7 100644 --- a/lib/kernel/test/erl_distribution_SUITE.erl +++ b/lib/kernel/test/erl_distribution_SUITE.erl @@ -582,8 +582,8 @@ dyn_node_name(Config) when is_list(Config) -> dyn_node_name(DCfg, _Config) -> NameDomain = case net_kernel:get_state() of - #{name_domain := short} -> "short"; - #{name_domain := long} -> "long" + #{name_domain := shortnames} -> "shortnames"; + #{name_domain := longnames} -> "longnames" end, {_N1F,Port1} = start_node_unconnected(DCfg ++ " -dist_listen false", undefined, ?MODULE, run_remote_test, @@ -606,8 +606,8 @@ dyn_node_name_do(TestNode, [NameDomainStr]) -> MyName = node(), false = (MyName =:= undefined), false = (MyName =:= nonode@nohost), - #{started := static, name_type := dynamic, name := MyName} - = net_kernel:get_state(), + #{started := static, name_type := dynamic, name := MyName, + name_domain := NameDomain} = net_kernel:get_state(), check([MyName], rpc:call(TestNode, erlang, nodes, [hidden])), {nodeup, MyName, [{node_type, visible}]} = receive_any(0), @@ -620,15 +620,15 @@ dyn_node_name_do(TestNode, [NameDomainStr]) -> {nodedown, MyName, [{node_type, visible}]} = receive_any(1000), nonode@nohost = node(), - #{started := static, name_type := dynamic, name := undefined} - = net_kernel:get_state(), + #{started := static, name_type := dynamic, name := undefined, + name_domain := NameDomain} = net_kernel:get_state(), net_kernel:connect_node(TestNode), [] = nodes(), [TestNode] = nodes(hidden), MyName = node(), - #{started := static, name_type := dynamic, name := MyName} - = net_kernel:get_state(), + #{started := static, name_type := dynamic, name := MyName, + name_domain := NameDomain} = net_kernel:get_state(), check([MyName], rpc:call(TestNode, erlang, nodes, [hidden])), @@ -641,8 +641,8 @@ dyn_node_name_do(TestNode, [NameDomainStr]) -> [] = nodes(hidden), {nodedown, MyName, [{node_type, visible}]} = receive_any(1000), nonode@nohost = node(), - #{started := static, name_type := dynamic, name := undefined} - = net_kernel:get_state(), + #{started := static, name_type := dynamic, name := undefined, + name_domain := NameDomain} = net_kernel:get_state(), ok. check(X, X) -> ok. -- 2.34.1
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor