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

hydra-queue-runner: Fix handling of missing derivations

Browse source 
This barfed with 'queue monitor: ERROR: column "errormsg" of relation
"builds" does not exist' due to the removal of the errorMsg column.
This commit is contained in:
Eelco Dolstra 2016-03-07 19:05:24 +01:00
parent e7ce225558
commit 2ab8e9a1e0
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/hydra-queue-runner/queue-monitor.cc
View file

@ -127,11 +127,10 @@ bool State::getQueuedBuilds(Connection & conn, ref<Store> localStore,
auto mc = startDbUpdate();
pqxx::work txn(conn);
txn.parameterized
("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $3, errorMsg = $4 where id = $1 and finished = 0")
("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $3 where id = $1 and finished = 0")
(build->id)
((int) bsAborted)
(time(0))
("derivation was garbage-collected prior to build").exec();
(time(0)).exec();
txn.commit();
build->finishedInDB = true;
nrBuildsDone++;