Merge branch 'kuba/inets/start_httpd_manager_first/OTP-19486/ERIERL-1190' into maint-27

* kuba/inets/start_httpd_manager_first/OTP-19486/ERIERL-1190:
  inets: fix httpd startup sequence + net_adm default

Author: Erlang/OTP

lib/inets/src/http_server/httpd_instance_sup.erl

@@ -80,22 +80,22 @@ init([ConfigFile, ConfigList, AcceptTimeout, Debug, Address, Port]) ->
     Profile = proplists:get_value(profile, ConfigList, ?DEFAULT_PROFILE),
     Flags = {one_for_one, 0, 1},
     Children  = [httpd_connection_sup_spec(Address, Port, Profile), 
-		 httpd_acceptor_sup_spec(Address, Port, Profile, ConfigList, AcceptTimeout,
-					 undefined), 
 		 sup_spec(httpd_misc_sup, Address, Port, Profile), 
 		 worker_spec(httpd_manager, Address, Port, Profile, 
-			     ConfigFile, ConfigList,AcceptTimeout)],
+			     ConfigFile, ConfigList,AcceptTimeout),
+                 httpd_acceptor_sup_spec(Address, Port, Profile, ConfigList, AcceptTimeout,
+                                         undefined)],
     {ok, {Flags, Children}};
 init([ConfigFile, ConfigList, AcceptTimeout, Debug, Address, Port, ListenInfo]) -> 
     httpd_util:enable_debug(Debug), 
     Profile = proplists:get_value(profile, ConfigList, ?DEFAULT_PROFILE),
     Flags = {one_for_one, 0, 1},
     Children  = [httpd_connection_sup_spec(Address, Port, Profile), 
-		 httpd_acceptor_sup_spec(Address, Port, Profile, ConfigList, AcceptTimeout,
-					 ListenInfo), 
 		 sup_spec(httpd_misc_sup, Address, Port, Profile), 
 		 worker_spec(httpd_manager, Address, Port, Profile, ListenInfo, 
-			     ConfigFile, ConfigList, AcceptTimeout)],
+			     ConfigFile, ConfigList, AcceptTimeout),
+		 httpd_acceptor_sup_spec(Address, Port, Profile, ConfigList, AcceptTimeout,
+					 ListenInfo)],
     {ok, {Flags, Children}}.
 
 

lib/inets/src/http_server/httpd_request_handler.erl

@@ -99,9 +99,18 @@ init([Manager, ConfigDB, AcceptTimeout]) ->
     %% At this point the function httpd_request_handler:start/2 will return.
     proc_lib:init_ack({ok, self()}),
     {SocketType, Socket} = await_socket_ownership_transfer(AcceptTimeout),
-    ServerName = erlang:iolist_to_binary(httpd_util:lookup(ConfigDB, server_name)),
+    ServerName =
+        case httpd_util:lookup(ConfigDB, server_name) of
+            undefined ->
+                %% ERIERL-1190 workaround - on some rare occassions
+                %% server_name can't be read from ets table
+                net_adm:localhost();
+            EtsValue ->
+                EtsValue
+        end,
+    ServerNameBin = erlang:iolist_to_binary(ServerName),
     Protocol = protocol(SocketType),
-    proc_lib:set_label({Protocol, ServerName}),
+    proc_lib:set_label({Protocol, ServerNameBin}),
 
     Peername = http_transport:peername(SocketType, Socket),
     Sockname = http_transport:sockname(SocketType, Socket),