guiwf/lix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include orignal json in worker error message

Browse Source
This commit is contained in:
Jörg Thalheim
2023-12-10 20:36:24 +00:00
committed by mergify[bot]
parent d48cfadb3d
commit e1ad62cef1
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nix-eval-jobs.cc
+8 -6
View File
@@ -129,7 +129,7 @@ void collector(Sync<State> &state_, std::condition_variable &wakeup) {
/* Check whether the existing worker process is still there. */
auto s = fromReader->readLine();
if (s == "") {
if (s.empty()) {
handleBrokenWorkerPipe(*proc.get());
} else if (s == "restart") {
proc_ = std::nullopt;
@@ -140,8 +140,9 @@ void collector(Sync<State> &state_, std::condition_variable &wakeup) {
auto json = json::parse(s);
throw Error("worker error: %s", (std::string)json["error"]);
} catch (const json::exception &e) {
throw Error("Received invalid JSON from worker: %s '%s'",
e.what(), s);
throw Error(
"Received invalid JSON from worker: %s\n json: '%s'",
e.what(), s);
}
}
@@ -174,15 +175,16 @@ void collector(Sync<State> &state_, std::condition_variable &wakeup) {
/* Wait for the response. */
auto respString = fromReader->readLine();
if (respString == "") {
if (respString.empty()) {
handleBrokenWorkerPipe(*proc.get());
}
json response;
try {
response = json::parse(respString);
} catch (const json::exception &e) {
throw Error("Received invalid JSON from worker: %s '%s'",
e.what(), respString);
throw Error(
"Received invalid JSON from worker: %s\n json: '%s'",
e.what(), respString);
}
/* Handle the response. */