@@ -108,8 +108,6 @@ static GHashTable *default_env = NULL;
108
108
109
109
static gboolean _cfg_reload (gboolean services_only , GError * * err );
110
110
111
- static void servers_ensure (void );
112
-
113
111
static GOptionEntry entries [] = {
114
112
{"daemonize" , 'd' , 0 , G_OPTION_ARG_NONE , (gboolean * )& flag_daemon ,
115
113
"Detaches then daemonizes the gridinit" , NULL },
@@ -544,9 +542,7 @@ supervisor_signal_handler(int s, short flags, void *udata)
544
542
case SIGUSR1 :
545
543
flag_more_verbose = ~0 ;
546
544
return ;
547
- case SIGUSR2 :
548
- flag_check_socket = ~0 ;
549
- return ;
545
+ case SIGUSR2 : /* ignored */
550
546
case SIGPIPE : /* ignored */
551
547
return ;
552
548
case SIGINT :
@@ -919,42 +915,6 @@ servers_clean(void)
919
915
list_of_servers = NULL ;
920
916
}
921
917
922
- /**
923
- * Reopens all the UNIX server sockets bond on paths that changed.
924
- */
925
- static void
926
- servers_ensure (void )
927
- {
928
- GList * l ;
929
-
930
- flag_check_socket = 0 ;
931
- TRACE ("About to ensure the server sockets" );
932
-
933
- for (l = list_of_servers ; l ; l = l -> next ) {
934
- struct server_sock_s * p_server = l -> data ;
935
-
936
- NOTICE ("Ensuring socket fd=%d bond to [%s]" , p_server -> fd , p_server -> url );
937
-
938
- if (servers_is_unix (p_server ) && !servers_is_the_same (p_server )) {
939
-
940
- /* close */
941
- servers_unmonitor_one (p_server );
942
-
943
- /* reopen */
944
- p_server -> fd = __open_unix_server (p_server -> url );
945
- if (p_server -> fd < 0 ) {
946
- WARN ("unix: failed to reopen a server bond to [%s] : %s" ,
947
- p_server -> url , strerror (errno ));
948
- }
949
- else if (!servers_monitor_one (p_server )) {
950
- WARN ("unix: failed to monitor a server bond to [%s] : %s" ,
951
- p_server -> url , strerror (errno ));
952
- servers_unmonitor_one (p_server );
953
- }
954
- }
955
- }
956
- }
957
-
958
918
/* Signals management ------------------------------------------------------ */
959
919
960
920
static void
@@ -1984,8 +1944,6 @@ main(int argc, char ** args)
1984
1944
1985
1945
if (!flag_running )
1986
1946
break ;
1987
- if (flag_check_socket )
1988
- servers_ensure ();
1989
1947
if (flag_more_verbose ) {
1990
1948
NOTICE ("Increasing verbosity for 15 minutes" );
1991
1949
logger_verbose ();
0 commit comments