Software / code / prosody
Diff
prosody @ 5937:bcad61007a4e
prosody: Store the config file name so the same file can be used when reloading
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 13 Dec 2013 10:25:40 +0100 |
| parent | 5428:4cc7df30f521 |
| child | 5939:56d81af64fc5 |
| child | 6066:95b3a59d7932 |
line wrap: on
line diff
--- 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));
