# HG changeset patch # User Kim Alvefur # Date 1632141488 -7200 # Node ID ae43166fe93169210d65ce3cfc905913999c1e96 # Parent fe0cdbad19c35a3c48c1119e72453510513ccaad net.server_epoll: Add a hard deadline on shutdown to extra-fix #1670 Should ensure shutdown even if sockets somehow take a very long to get closed. diff -r fe0cdbad19c3 -r ae43166fe931 net/server_epoll.lua --- a/net/server_epoll.lua Mon Sep 20 14:42:18 2021 +0200 +++ b/net/server_epoll.lua Mon Sep 20 14:38:08 2021 +0200 @@ -58,6 +58,9 @@ -- Maximum and minimum amount of time to sleep waiting for events (adjusted for pending timers) max_wait = 86400; min_wait = 1e-06; + + --- How long to wait after getting the shutdown signal before forcefully tearing down every socket + shutdown_deadline = 5; }}; local cfg = default_config.__index; @@ -749,6 +752,15 @@ return 1; end end); + if cfg.shutdown_deadline then + addtimer(cfg.shutdown_deadline, function () + if quitting then + for fd, conn in pairs(fds) do -- luacheck: ignore 213/fd + conn:destroy(); + end + end + end); + end else quitting = nil; end