Mercurial > prosody-modules
changeset 2165:e0b8b8a50013
Merge with Link Mauve
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 17 Apr 2016 21:41:48 +0200 |
| parents | 88fec2b2bd58 (diff) 4b58e35a72e0 (current diff) |
| children | 13f8ad3293c4 |
| files | |
| diffstat | 2 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mod_http_logging/mod_http_logging.lua Sat Apr 16 12:48:00 2016 +0100 +++ b/mod_http_logging/mod_http_logging.lua Sun Apr 17 21:41:48 2016 +0200 @@ -25,7 +25,7 @@ local date = os.date("%d/%m/%Y:%H:%M:%S %z"); module:log("info", "%s - - [%s] \"%s\" %d %s", ip, date, req, response.status_code, tostring(len)); end - return server.send_response(response, body); + return send_response(response, body); end if module.wrap_object_event then
--- a/mod_s2s_keepalive/README.markdown Sat Apr 16 12:48:00 2016 +0100 +++ b/mod_s2s_keepalive/README.markdown Sun Apr 17 21:41:48 2016 +0200 @@ -5,7 +5,7 @@ Introduction ============ -This module periodically sends XEP-0199 ping requests to remote servers +This module periodically sends [XEP-0199] ping requests to remote servers to keep your connection alive. Configuration @@ -15,13 +15,15 @@ desired servers in `keepalive_servers`. Optionally you can configure the ping interval. - modules_enabled = { - ... - "s2s_keepalive" - } +``` lua +modules_enabled = { + ... + "s2s_keepalive" +} - keepalive_servers = { "conference.prosody.im"; "rooms.swift.im" } - keepalive_interval = "300" -- (in seconds, default is 60 ) +keepalive_servers = { "conference.prosody.im"; "rooms.swift.im" } +keepalive_interval = "300" -- (in seconds, default is 60 ) +``` Compatibility =============