fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improved JSON config error reporting

Browse source 
Show incorrect lines in config.json together with line number and position.
This commit is contained in:
SChernykh 2020-04-29 11:08:45 +02:00
parent b38046db46
commit 05d3f17f15
5 changed files with 99 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/base/io/json/JsonChain.cpp
View file

@ -64,7 +64,27 @@ bool xmrig::JsonChain::addFile(const char *fileName)
}
if (doc.HasParseError()) {
LOG_ERR("%s<offset:%zu>: \"%s\"", fileName, doc.GetErrorOffset(), GetParseError_En(doc.GetParseError()));
const size_t offset = doc.GetErrorOffset();
size_t line, pos;
std::vector<std::string> s;
if (Json::convertOffset(fileName, offset, line, pos, s)) {
for (const auto& t : s) {
LOG_ERR("%s", t.c_str());
}
std::string t;
if (pos > 0) {
t.assign(pos - 1, ' ');
}
t += '^';
LOG_ERR("%s", t.c_str());
LOG_ERR("%s<line:%zu, position:%zu>: \"%s\"", fileName, line, pos, GetParseError_En(doc.GetParseError()));
}
else {
LOG_ERR("%s<offset:%zu>: \"%s\"", fileName, offset, GetParseError_En(doc.GetParseError()));
}
}
else {
LOG_ERR("unable to open \"%s\".", fileName);