diff options
| author | Kim Alvefur <zash@zash.se> | 2016-01-26 14:15:38 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-01-26 14:15:38 +0100 |
| commit | acfde68f955864f2c08a3e6e85f7c95e1d7bd949 (patch) | |
| tree | ef4b387b06b3d7a01769c3281ec3e928cd7c3385 | |
| parent | 931549f781d8a0cb98af05b98cf00880dca5fb9f (diff) | |
| parent | ab4c6bee84551806f9dc07eb8f1427d1c066eddf (diff) | |
| download | prosody-acfde68f955864f2c08a3e6e85f7c95e1d7bd949.tar.gz prosody-acfde68f955864f2c08a3e6e85f7c95e1d7bd949.zip | |
Merge 0.10->trunk
| -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 a199d0ac..c1357bf7 100644 --- a/plugins/mod_s2s/mod_s2s.lua +++ b/plugins/mod_s2s/mod_s2s.lua @@ -683,7 +683,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); |