delroth/hydra
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Improve logging for aborts

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-19 10:37:22 +02:00
parent 8db1ae2855
commit 77c8bfd392
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -1070,8 +1070,6 @@ bool State::doBuildStep(std::shared_ptr<StoreAPI> store, Step::ptr step,
} catch (Error & e) { } catch (Error & e) {
result.status = RemoteResult::rrMiscFailure; result.status = RemoteResult::rrMiscFailure;
result.errorMsg = e.msg(); result.errorMsg = e.msg();
printMsg(lvlError, format("irregular failure building ‘%1%’ on ‘%2%’: %3%")
% step->drvPath % machine->sshName % e.msg());
} }
if (result.status == RemoteResult::rrSuccess) res = getBuildResult(store, step->drv); if (result.status == RemoteResult::rrSuccess) res = getBuildResult(store, step->drv);
@ -1082,6 +1080,8 @@ bool State::doBuildStep(std::shared_ptr<StoreAPI> store, Step::ptr step,
/* The step had a hopefully temporary failure (e.g. network /* The step had a hopefully temporary failure (e.g. network
issue). Retry a number of times. */ issue). Retry a number of times. */
if (result.status == RemoteResult::rrMiscFailure) { if (result.status == RemoteResult::rrMiscFailure) {
printMsg(lvlError, format("irregular failure building ‘%1%’ on ‘%2%’: %3%")
% step->drvPath % machine->sshName % result.errorMsg);
bool retry; bool retry;
{ {
auto step_(step->state.lock()); auto step_(step->state.lock());