X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/de36941445d328fd7038589b70422a3a766fe3f7..8aadf0ce464a0e18e987a401a694d48d293953e6:/ircd/wsproc.c

diff --git a/ircd/wsproc.c b/ircd/wsproc.c
index b11b0f3d..0c511c6a 100644
--- a/ircd/wsproc.c
+++ b/ircd/wsproc.c
@@ -194,7 +194,7 @@ ws_dead(ws_ctl_t * ctl)
 	{
 		wsockd_count--;
 		ilog(L_MAIN, "wsockd helper died - attempting to restart");
-		sendto_realops_snomask(SNO_GENERAL, L_ALL, "wsockd helper died - attempting to restart");
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "wsockd helper died - attempting to restart");
 		start_wsockd(1);
 	}
 }
@@ -223,7 +223,7 @@ restart_wsockd_event(void *unused)
 	{
 		int start = ServerInfo.wsockd_count - get_wsockd_count();
 		ilog(L_MAIN, "Attempting to restart wsockd processes");
-		sendto_realops_snomask(SNO_GENERAL, L_ALL, "Attempting to restart wsockd processes");
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Attempting to restart wsockd processes");
 		start_wsockd(start);
 	}
 }
@@ -253,7 +253,7 @@ start_wsockd(int count)
 	if(wsockd_spin_count > 20 && (rb_current_time() - last_spin < 5))
 	{
 		ilog(L_MAIN, "wsockd helper is spinning - will attempt to restart in 1 minute");
-		sendto_realops_snomask(SNO_GENERAL, L_ALL,
+		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE,
 				       "wsockd helper is spinning - will attempt to restart in 1 minute");
 		rb_event_add("restart_wsockd_event", restart_wsockd_event, NULL, 60);
 		wsockd_wait = 1;
@@ -308,10 +308,8 @@ start_wsockd(int count)
 		snprintf(s_pid, sizeof(s_pid), "%d", (int)getpid());
 		rb_setenv("CTL_PPID", s_pid, 1);
 
-#ifdef _WIN32
-		SetHandleInformation((HANDLE) rb_get_fd(F2), HANDLE_FLAG_INHERIT, 1);
-		SetHandleInformation((HANDLE) rb_get_fd(P1), HANDLE_FLAG_INHERIT, 1);
-#endif
+		rb_clear_cloexec(F2);
+		rb_clear_cloexec(P1);
 
 		pid = rb_spawn_process(wsockd_path, (const char **) parv);
 		if(pid == -1)
@@ -380,7 +378,7 @@ ws_process_cmd_recv(ws_ctl_t * ctl)
 			break;
 		default:
 			ilog(L_MAIN, "Received invalid command from wsockd: %s", ctl_buf->buf);
-			sendto_realops_snomask(SNO_GENERAL, L_ALL, "Received invalid command from wsockd");
+			sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "Received invalid command from wsockd");
 			break;
 		}
 		rb_dlinkDelete(ptr, &ctl->readq);