Software / code / prosody
Changeset
9764:2f4240bfd147
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 06 Jan 2019 12:18:48 +0100 |
| parents | 9760:88640b3ea6b8 (current diff) 9763:982529dd0bed (diff) |
| children | 9765:5253555128ec |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_posix.lua Sun Jan 06 10:42:45 2019 +0100 +++ b/plugins/mod_posix.lua Sun Jan 06 12:18:48 2019 +0100 @@ -172,7 +172,7 @@ signal.signal("SIGHUP", function () module:log("info", "Received SIGHUP"); prosody.reload_config(); - prosody.reopen_logfiles(); + -- this also reloads logging end); signal.signal("SIGINT", function ()
--- a/util/startup.lua Sun Jan 06 10:42:45 2019 +0100 +++ b/util/startup.lua Sun Jan 06 12:18:48 2019 +0100 @@ -87,6 +87,9 @@ -- Initialize logging local loggingmanager = require "core.loggingmanager" loggingmanager.reload_logging(); + prosody.events.add_handler("config-reloaded", function () + prosody.events.fire_event("reopen-log-files"); + end); prosody.events.add_handler("reopen-log-files", function () loggingmanager.reload_logging(); prosody.events.fire_event("logging-reloaded");
