tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve error reporting for "icinga2 console" 

refs #8133
This commit is contained in:
Gunnar Beutner 2015-02-10 13:58:35 +01:00
parent 0490fe73f7
commit 9570b9d262
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/cli/consolecommand.cpp
View File

@ -130,16 +130,39 @@ incomplete:
DebugInfo di = ex.GetDebugInfo();
if (lines.find(di.Path) != lines.end()) {
int offset;
String text = lines[di.Path];
if (di.Path != fileName) {
std::cout << di.Path << ": " << lines[di.Path] << "\n";
offset = 2;
} else
offset = 4;
std::vector<String> ulines;
boost::algorithm::split(ulines, text, boost::is_any_of("\n"));
std::cout << String(di.Path.GetLength() + offset, ' ');
std::cout << String(di.FirstColumn, ' ') << String(di.LastColumn - di.FirstColumn + 1, '^') << "\n";
for (int i = 1; i <= ulines.size(); i++) {
int start, len;
if (i == di.FirstLine) {
start = di.FirstColumn;
if (start > 0)
start--;
} else
start = 0;
if (i == di.LastLine)
len = di.LastColumn - di.FirstColumn + 1;
else
len = ulines[i].GetLength();
int offset;
if (di.Path != fileName) {
std::cout << di.Path << ": " << ulines[i - 1] << "\n";
offset = 2;
} else
offset = 4;
if (i >= di.FirstLine && i <= di.LastLine) {
std::cout << String(di.Path.GetLength() + offset, ' ');
std::cout << String(start, ' ') << String(len, '^') << "\n";
}
}
} else {
ShowCodeFragment(std::cout, di);
}