forked from lix-project/lix
libutil/logging: extend internal-json
logger to make it more machine-readable
The new error-format is pretty nice from a UX point-of-view, however it's fairly hard to parse the output e.g. for editor plugins such as vim-ale[1] that use `nix-instantiate --parse` to determine syntax errors in Nix expression files. This patch extends the `internal-json` logger by adding the fields `line`, `column` and `file` to easily locate an error in a file and the field `raw_msg` which contains the error-message itself without code-lines and additional helpers. An exemplary output may look like this: ``` [nix-shell]$ ./inst/bin/nix-instantiate ~/test.nix --log-format minimal {"action":"msg","column":1,"file":"/home/ma27/test.nix","level":0,"line":4,"raw_msg":"syntax error, unexpected IF, expecting $end","msg":"<full error-msg with code-lines etc>"} ``` [1] https://github.com/dense-analysis/ale
This commit is contained in:
parent
ff314f186e
commit
6ccfdb79c7
|
@ -106,7 +106,14 @@
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry><term>internal-json</term>
|
<varlistentry><term>internal-json</term>
|
||||||
<listitem><para>Outputs the logs in a structured manner. NOTE: the json schema is not guarantees to be stable between releases.</para></listitem>
|
<listitem>
|
||||||
|
<para>Outputs the logs in a structured manner.</para>
|
||||||
|
<warning>
|
||||||
|
<para>
|
||||||
|
While the schema itself is relatively stable, the format of the error-messages (namely of the <literal>msg</literal>-field) can change between several releases.
|
||||||
|
</para>
|
||||||
|
</warning>
|
||||||
|
</listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry><term>bar</term>
|
<varlistentry><term>bar</term>
|
||||||
|
|
|
@ -184,6 +184,33 @@ struct JSONLogger : Logger {
|
||||||
json["action"] = "msg";
|
json["action"] = "msg";
|
||||||
json["level"] = ei.level;
|
json["level"] = ei.level;
|
||||||
json["msg"] = oss.str();
|
json["msg"] = oss.str();
|
||||||
|
json["raw_msg"] = ei.hint->str();
|
||||||
|
|
||||||
|
if (ei.errPos.has_value() && (*ei.errPos)) {
|
||||||
|
json["line"] = ei.errPos->line;
|
||||||
|
json["column"] = ei.errPos->column;
|
||||||
|
json["file"] = ei.errPos->file;
|
||||||
|
} else {
|
||||||
|
json["line"] = nullptr;
|
||||||
|
json["column"] = nullptr;
|
||||||
|
json["file"] = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (loggerSettings.showTrace.get() && !ei.traces.empty()) {
|
||||||
|
nlohmann::json traces = nlohmann::json::array();
|
||||||
|
for (auto iter = ei.traces.rbegin(); iter != ei.traces.rend(); ++iter) {
|
||||||
|
nlohmann::json stackFrame;
|
||||||
|
stackFrame["raw_msg"] = iter->hint.str();
|
||||||
|
if (iter->pos.has_value() && (*iter->pos)) {
|
||||||
|
stackFrame["line"] = iter->pos->line;
|
||||||
|
stackFrame["column"] = iter->pos->column;
|
||||||
|
stackFrame["file"] = iter->pos->file;
|
||||||
|
}
|
||||||
|
traces.push_back(stackFrame);
|
||||||
|
}
|
||||||
|
|
||||||
|
json["trace"] = traces;
|
||||||
|
}
|
||||||
|
|
||||||
write(json);
|
write(json);
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,6 +34,24 @@ namespace nix {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST(logEI, jsonOutput) {
|
||||||
|
SymbolTable testTable;
|
||||||
|
auto problem_file = testTable.create("random.nix");
|
||||||
|
testing::internal::CaptureStderr();
|
||||||
|
|
||||||
|
makeJSONLogger(*logger)->logEI({
|
||||||
|
.name = "error name",
|
||||||
|
.description = "error without any code lines.",
|
||||||
|
.hint = hintfmt("this hint has %1% templated %2%!!",
|
||||||
|
"yellow",
|
||||||
|
"values"),
|
||||||
|
.errPos = Pos(foFile, problem_file, 02, 13)
|
||||||
|
});
|
||||||
|
|
||||||
|
auto str = testing::internal::GetCapturedStderr();
|
||||||
|
ASSERT_STREQ(str.c_str(), "\x1B[31;1merror:\x1B[0m\x1B[34;1m --- SysError --- error-unit-test\x1B[0m\nopening file '\x1B[33;1mrandom.nix\x1B[0m': \x1B[33;1mNo such file or directory\x1B[0m\n@nix {\"action\":\"msg\",\"column\":13,\"file\":\"random.nix\",\"level\":0,\"line\":2,\"msg\":\"\\u001b[31;1merror:\\u001b[0m\\u001b[34;1m --- error name --- error-unit-test\\u001b[0m\\n\\u001b[34;1mat: \\u001b[33;1m(2:13)\\u001b[34;1m in file: \\u001b[0mrandom.nix\\n\\nerror without any code lines.\\n\\nthis hint has \\u001b[33;1myellow\\u001b[0m templated \\u001b[33;1mvalues\\u001b[0m!!\",\"raw_msg\":\"this hint has \\u001b[33;1myellow\\u001b[0m templated \\u001b[33;1mvalues\\u001b[0m!!\"}\n");
|
||||||
|
}
|
||||||
|
|
||||||
TEST(logEI, appendingHintsToPreviousError) {
|
TEST(logEI, appendingHintsToPreviousError) {
|
||||||
|
|
||||||
MakeError(TestError, Error);
|
MakeError(TestError, Error);
|
||||||
|
|
Loading…
Reference in a new issue