ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Update libpqxx usage to move away from deprecated API interactions.

Browse Source
This commit is contained in:
Kevin Quick
2020-01-11 22:38:40 -08:00
parent 5c0c7d52a0
commit 7bb6b5e206
4 changed files with 168 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/hydra-queue-runner/builder.cc
View File

@ -424,13 +424,13 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
for (auto & build2 : indirect) {
if (build2->finishedInDB) continue;
printMsg(lvlError, format("marking build %1% as failed") % build2->id);
txn.parameterized
("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, isCachedBuild = $5, notificationPendingSince = $4 where id = $1 and finished = 0")
(build2->id)
((int) (build2->drvPath != step->drvPath && result.buildStatus() == bsFailed ? bsDepFailed : result.buildStatus()))
(result.startTime)
(result.stopTime)
(result.stepStatus == bsCachedFailure ? 1 : 0).exec();
txn.exec_params0
("update Builds set finished = 1, buildStatus = $2, startTime = $3, stopTime = $4, isCachedBuild = $5, notificationPendingSince = $4 where id = $1 and finished = 0",
build2->id,
(int) (build2->drvPath != step->drvPath && result.buildStatus() == bsFailed ? bsDepFailed : result.buildStatus()),
result.startTime,
result.stopTime,
result.stepStatus == bsCachedFailure ? 1 : 0);
nrBuildsDone++;
}
@ -438,7 +438,7 @@ State::StepResult State::doBuildStep(nix::ref<Store> destStore,
won't be built again. */
if (result.stepStatus != bsCachedFailure && result.canCache)
for (auto & path : step->drv.outputPaths())
txn.parameterized("insert into FailedPaths values ($1)")(path).exec();
txn.exec_params0("insert into FailedPaths values ($1)", path);
txn.commit();
}