# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1386926740 -3600
# Node ID bcad61007a4eede1c0cdf1695916a0f9c31129a7
# Parent  4016e6efdcf6bd99fd548e8275db89ad8a5fa1b6
prosody: Store the config file name so the same file can be used when reloading

diff -r 4016e6efdcf6 -r bcad61007a4e prosody
--- a/prosody	Wed Dec 04 15:06:48 2013 +0000
+++ b/prosody	Fri Dec 13 10:25:40 2013 +0100
@@ -86,6 +86,7 @@
 			break;
 		end
 	end
+	prosody.config_file = filename
 	local ok, level, err = config.load(filename);
 	if not ok then
 		print("\n");
@@ -240,7 +241,7 @@
 	function prosody.reload_config()
 		log("info", "Reloading configuration file");
 		prosody.events.fire_event("reloading-config");
-		local ok, level, err = config.load((rawget(_G, "CFG_CONFIGDIR") or ".").."/prosody.cfg.lua");
+		local ok, level, err = config.load(prosody.config_file);
 		if not ok then
 			if level == "parser" then
 				log("error", "There was an error parsing the configuration file: %s", tostring(err));