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

Keep track of the number of build steps that are being built

Browse Source 
(As opposed to being in the closure copying stage.)
This commit is contained in:
Eelco Dolstra
2015-06-22 11:23:00 +02:00
parent fed71d3fe9
commit 44a2b74f5a
4 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/hydra-queue-runner/build-remote.cc
View File

@ -114,7 +114,7 @@ void buildRemote(std::shared_ptr<StoreAPI> store,
const string & sshName, const string & sshKey,
const Path & drvPath, const Derivation & drv,
const nix::Path & logDir, unsigned int maxSilentTime, unsigned int buildTimeout,
RemoteResult & result)
RemoteResult & result, counter & nrStepsBuilding)
{
string base = baseNameOf(drvPath);
result.logFile = logDir + "/" + string(base, 0, 2) + "/" + string(base, 2);
@ -176,7 +176,11 @@ void buildRemote(std::shared_ptr<StoreAPI> store,
// FIXME: send maxLogSize.
to.flush();
result.startTime = time(0);
int res = readInt(from);
int res;
{
MaintainCount mc(nrStepsBuilding);
res = readInt(from);
}
result.stopTime = time(0);
if (res) {
result.errorMsg = (format("%1% on ‘%2%’") % readString(from) % sshName).str();