aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-01 19:34:18 +0100
committerKim Alvefur <zash@zash.se>2017-01-01 19:34:18 +0100
commitcced8730558fbc331ab1b7c8f1574b34c625d761 (patch)
treee7417e8c29dfbf3a29c237f63f42f4db36c8e820
parent827faaf5f98c8c4fdb8eb322202a2c5fb44b3b1c (diff)
downloadprosody-cced8730558fbc331ab1b7c8f1574b34c625d761.tar.gz
prosody-cced8730558fbc331ab1b7c8f1574b34c625d761.zip
server_epoll: Flush and close all connections before quitting mainloop so no data is lost in buffers
-rw-r--r--net/server_epoll.lua4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/server_epoll.lua b/net/server_epoll.lua
index d5f9d266..274368b0 100644
--- a/net/server_epoll.lua
+++ b/net/server_epoll.lua
@@ -15,6 +15,7 @@ local t_concat = table.concat;
local setmetatable = setmetatable;
local tostring = tostring;
local pcall = pcall;
+local next = next;
local pairs = pairs;
local log = require "util.logger".init("server_epoll");
local epoll = require "epoll";
@@ -615,6 +616,7 @@ local quitting = nil;
local function setquitting(quit)
if quit then
quitting = "quitting";
+ closeall();
else
quitting = nil;
end
@@ -641,7 +643,7 @@ local function loop(once)
elseif r ~= "timeout" then
log("debug", "epoll_wait error: %s", tostring(r));
end
- until once or quitting;
+ until once or (quitting and next(fds) == nil);
return quitting;
end