From 7c610628cd907b8d04dbfe28dd23a0fa958c7dcd Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 13 Jul 2010 00:51:48 +0200 Subject: [PATCH] socket: when going down, flush all queued sockets --- src/socket.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/socket.c b/src/socket.c index f998cada2..4a9c93993 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1033,7 +1033,18 @@ static void socket_enter_running(Socket *s, int cfd) { /* We don't take connections anymore if we are supposed to * shut down anyway */ if (s->meta.job && s->meta.job->type == JOB_STOP) { - close_nointr_nofail(cfd); + if (cfd >= 0) + close_nointr_nofail(cfd); + else { + /* Flush all sockets by closing and reopening them */ + socket_close_fds(s); + + if ((r = socket_watch_fds(s)) < 0) { + log_warning("%s failed to watch sockets: %s", s->meta.id, strerror(-r)); + socket_enter_stop_pre(s, false); + } + } + return; } -- 2.30.2