diff options
| author | Kim Alvefur <zash@zash.se> | 2016-01-26 14:15:00 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-01-26 14:15:00 +0100 |
| commit | ab4c6bee84551806f9dc07eb8f1427d1c066eddf (patch) | |
| tree | c63908e8caa9cb9a337540f1b624afc460cd6ce3 | |
| parent | 6116ba8cfbeff29bd3c4cedd1b05babec47e1507 (diff) | |
| parent | 1875b4a83dd0ab0e0325b621620aa486b4e1322d (diff) | |
| download | prosody-ab4c6bee84551806f9dc07eb8f1427d1c066eddf.tar.gz prosody-ab4c6bee84551806f9dc07eb8f1427d1c066eddf.zip | |
Merge 0.9->0.10
| -rw-r--r-- | plugins/mod_c2s.lua | 2 | ||||
| -rw-r--r-- | plugins/mod_s2s/mod_s2s.lua | 2 |
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); |