Software / code / prosody
Diff
prosody @ 8153:c22d5680ca68
configmanager: Remove support for multiple parsers, fixes #852.
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> |
|---|---|
| date | Sat, 27 May 2017 15:32:28 +0100 |
| parent | 7878:2fdb7b3648d8 |
| child | 8201:a0ad62a269df |
line wrap: on
line diff
--- a/prosody Sat May 20 15:00:50 2017 +0200 +++ b/prosody Sat May 27 15:32:28 2017 +0100 @@ -76,9 +76,7 @@ elseif os.getenv("PROSODY_CONFIG") then -- Passed by prosodyctl table.insert(filenames, os.getenv("PROSODY_CONFIG")); else - for _, format in ipairs(config.parsers()) do - table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format); - end + table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); end for _,_filename in ipairs(filenames) do filename = _filename;
