mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-09-04 00:05:11 +00:00
Code Issues Releases Wiki Activity

When shutting down the server, close non-I/O log connections immediately.

Browse Source 
Avoids a timeout during server shutdown while the server waits for
active connections to close.
This commit is contained in:
Todd C. Miller
2020-12-03 14:40:30 -07:00
parent cbb7b4afa6
commit c5a7f0eb42
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
logsrvd/logsrvd.c
View File

@@ -745,15 +745,19 @@ server_shutdown(struct sudo_event_base *base)
debug_return; debug_return;
} }
/* Schedule final commit point for each active connection. */
TAILQ_FOREACH(closure, &connections, entries) { TAILQ_FOREACH(closure, &connections, entries) {
closure->state = SHUTDOWN; closure->state = SHUTDOWN;
sudo_ev_del(base, closure->read_ev); sudo_ev_del(base, closure->read_ev);
if (closure->log_io) { if (closure->log_io) {
/* Schedule final commit point for the connection. */
if (sudo_ev_add(base, closure->commit_ev, &tv, false) == -1) { if (sudo_ev_add(base, closure->commit_ev, &tv, false) == -1) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"unable to add commit point event"); "unable to add commit point event");
} }
} else {
/* No commit point, close connection immediately. */
sudo_ev_del(closure->evbase, closure->write_ev);
connection_closure_free(closure);
} }
} }