prosody
c22d5680ca68
prosodyctl

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

prosodyctl @ 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 8146:5c91fb62338e
child 8181:79f73af4c410
comparison
equal deleted inserted replaced
8150:4720f5ec4171 8153:c22d5680ca68
72 if CFG_CONFIGDIR then 72 if CFG_CONFIGDIR then
73 table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]); 73 table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]);
74 end 74 end
75 table.remove(arg, 1); table.remove(arg, 1); 75 table.remove(arg, 1); table.remove(arg, 1);
76 else 76 else
77 for _, format in ipairs(config.parsers()) do 77 table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
78 table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format);
79 end
80 end 78 end
81 for _,_filename in ipairs(filenames) do 79 for _,_filename in ipairs(filenames) do
82 filename = _filename; 80 filename = _filename;
83 local file = io.open(filename); 81 local file = io.open(filename);
84 if file then 82 if file then