aboutsummaryrefslogtreecommitdiffstats
path: root/prosody
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2013-12-13 10:25:40 +0100
committerKim Alvefur <zash@zash.se>2013-12-13 10:25:40 +0100
commit5d980f3e9d99fae86ee0ce4d2a70672237a98356 (patch)
tree5a5497775dd607043a77f81103401c5e3dd9d1ae /prosody
parent973af6a3af0ca1abd50f551108d3060cdf3f6758 (diff)
downloadprosody-5d980f3e9d99fae86ee0ce4d2a70672237a98356.tar.gz
prosody-5d980f3e9d99fae86ee0ce4d2a70672237a98356.zip
prosody: Store the config file name so the same file can be used when reloading
Diffstat (limited to 'prosody')
-rwxr-xr-xprosody3
1 files changed, 2 insertions, 1 deletions
diff --git a/prosody b/prosody
index 9a88eac0..ee2baca5 100755
--- a/prosody
+++ b/prosody
@@ -86,6 +86,7 @@ function read_config()
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 init_global_state()
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));