# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1546773528 -3600
# Node ID 2f4240bfd1476191721c6b685787850b5b0ed02e
# Parent  88640b3ea6b8964f83321552f38fd1e58927718e# Parent  982529dd0bed0bdaee863a7766d55b27a3cad775
Merge 0.11->trunk

diff -r 88640b3ea6b8 -r 2f4240bfd147 plugins/mod_posix.lua
--- 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 ()
diff -r 88640b3ea6b8 -r 2f4240bfd147 util/startup.lua
--- 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");