diff options
author | Kim Alvefur <zash@zash.se> | 2013-12-13 10:25:40 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2013-12-13 10:25:40 +0100 |
commit | 5d980f3e9d99fae86ee0ce4d2a70672237a98356 (patch) | |
tree | 5a5497775dd607043a77f81103401c5e3dd9d1ae /prosody | |
parent | 973af6a3af0ca1abd50f551108d3060cdf3f6758 (diff) | |
download | prosody-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-x | prosody | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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)); |