aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-26 14:15:00 +0100
committerKim Alvefur <zash@zash.se>2016-01-26 14:15:00 +0100
commit11babda38656a487262f9458a531601ab0fc7738 (patch)
treec63908e8caa9cb9a337540f1b624afc460cd6ce3 /plugins
parent9cfa6a9d4994b61842b2478df4470922fb3a2546 (diff)
parenta5ed824a00990ccd5f2c8ae1838c13b1ad1990fc (diff)
downloadprosody-11babda38656a487262f9458a531601ab0fc7738.tar.gz
prosody-11babda38656a487262f9458a531601ab0fc7738.zip
Merge 0.9->0.10
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_c2s.lua2
-rw-r--r--plugins/mod_s2s/mod_s2s.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 3d9f9f88..c638cd03 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -313,7 +313,7 @@ module:hook("server-stopping", function(event)
for _, session in pairs(sessions) do
session:close{ condition = "system-shutdown", text = reason };
end
-end, 1000);
+end, -100);
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index 2fda63ce..3e80c77b 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -680,7 +680,7 @@ module:hook("server-stopping", function(event)
for _, session in pairs(sessions) do
session:close{ condition = "system-shutdown", text = reason };
end
-end,500);
+end, -200);