diff options
| author | Kim Alvefur <zash@zash.se> | 2019-01-06 12:18:48 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-01-06 12:18:48 +0100 |
| commit | 8321e093388eb2374d56cfe7dd023388c46a3202 (patch) | |
| tree | 4835386e930acc8100f602f212510efe7f49e11a | |
| parent | 17be1c595df0e62ff28d9e115b83ace74c800db0 (diff) | |
| parent | 2c8b0b80608ccea6b7cbd157ccc400338c8e5f38 (diff) | |
| download | prosody-8321e093388eb2374d56cfe7dd023388c46a3202.tar.gz prosody-8321e093388eb2374d56cfe7dd023388c46a3202.zip | |
Merge 0.11->trunk
| -rw-r--r-- | plugins/mod_posix.lua | 2 | ||||
| -rw-r--r-- | util/startup.lua | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua index 825d3be0..23df4d23 100644 --- a/plugins/mod_posix.lua +++ b/plugins/mod_posix.lua @@ -172,7 +172,7 @@ if have_signal then signal.signal("SIGHUP", function () module:log("info", "Received SIGHUP"); prosody.reload_config(); - prosody.reopen_logfiles(); + -- this also reloads logging end); signal.signal("SIGINT", function () diff --git a/util/startup.lua b/util/startup.lua index e92867dc..c101c290 100644 --- a/util/startup.lua +++ b/util/startup.lua @@ -87,6 +87,9 @@ function startup.init_logging() -- 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"); |