Remove wait_for_dns

esl · Nov 17, 2023 · afa29df · afa29df
1 parent 5d76f22
commit afa29df
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/config/mongoose_config_spec.erl b/src/config/mongoose_config_spec.erl
@@ -457,11 +457,9 @@ internal_database_cets() ->
                  <<"cluster_name">> => #option{type = atom, validate = non_empty},
                  %% Relative to the release directory (or an absolute name)
                  <<"node_list_file">> => #option{type = string,
-                                                 validate = filename},
-                 <<"wait_for_dns">> => #option{type = boolean}
+                                                 validate = filename}
                 },
-       defaults = #{<<"backend">> => rdbms, <<"cluster_name">> => mongooseim,
-                    <<"wait_for_dns">> => false}
+       defaults = #{<<"backend">> => rdbms, <<"cluster_name">> => mongooseim}
       }.
 
 %% path: internal_databases.mnesia

diff --git a/src/mongoose_cets_discovery.erl b/src/mongoose_cets_discovery.erl
@@ -17,7 +17,7 @@ supervisor_specs() ->
 
 supervisor_specs(disabled) ->
     [];
-supervisor_specs(#{backend := DiscoBackend, cluster_name := ClusterName, wait_for_dns := WaitForDNS} = Opts) ->
+supervisor_specs(#{backend := DiscoBackend, cluster_name := ClusterName} = Opts) ->
     DiscoFile =
         case {DiscoBackend, Opts} of
             {file, #{node_list_file := NodeFile}} ->
@@ -33,8 +33,7 @@ supervisor_specs(#{backend := DiscoBackend, cluster_name := ClusterName, wait_fo
         backend_module => disco_backend_to_module(DiscoBackend),
         cluster_name => atom_to_binary(ClusterName),
         node_name_to_insert => atom_to_binary(node(), latin1),
-        name => mongoose_cets_discovery, disco_file => DiscoFile,
-        wait_for_dns => WaitForDNS},
+        name => mongoose_cets_discovery, disco_file => DiscoFile},
     CetsDisco =
         {cets_discovery,
           {?MODULE, start_link, [DiscoOpts]},

diff --git a/test/common/config_parser_helper.erl b/test/common/config_parser_helper.erl
@@ -67,7 +67,7 @@ options("miscellaneous") ->
      {hosts, [<<"localhost">>, <<"anonymous.localhost">>]},
      {internal_databases,
           #{cets =>
-                #{backend => rdbms, cluster_name => mongooseim, wait_for_dns => false},
+                #{backend => rdbms, cluster_name => mongooseim},
             mnesia => #{}}},
      {language, <<"en">>},
      {listen,
@@ -145,7 +145,7 @@ options("mongooseim-pgsql") ->
       [<<"localhost">>, <<"anonymous.localhost">>, <<"localhost.bis">>]},
      {internal_databases,
           #{cets =>
-                #{backend => rdbms, cluster_name => mongooseim, wait_for_dns => false},
+                #{backend => rdbms, cluster_name => mongooseim},
             mnesia => #{}}},
      {language, <<"en">>},
      {listen,

diff --git a/test/config_parser_SUITE.erl b/test/config_parser_SUITE.erl
@@ -1193,7 +1193,6 @@ internal_database_cets(_Config) ->
          #{<<"internal_databases">> => #{<<"cets">> => #{<<"cluster_name">> => <<"test">>}}}),
 
     ?cfg([internal_databases, cets, cluster_name], mongooseim, CetsEnabled),
-    ?cfg([internal_databases, cets, wait_for_dns], false, CetsEnabled),
     ?cfg([internal_databases, cets, node_list_file], "/dev/null", CetsFile),
     %% If only mnesia section is defined, CETS section is not included
     ?cfg([internal_databases], #{mnesia => #{}},