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

Merge remote-tracking branch 'origin/master' into binary-cache

Browse Source
This commit is contained in:
Eelco Dolstra
2016-02-17 11:54:59 +01:00
parent 25022bf5fd d7a123fcd4
commit ce5790285a
7 changed files with 41 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/hydra-queue-runner/state.hh
View File

@ -49,6 +49,7 @@ typedef enum {
struct RemoteResult : nix::BuildResult
{
time_t startTime = 0, stopTime = 0;
unsigned int overhead = 0;
nix::Path logFile;
bool canRetry()
@ -370,7 +371,8 @@ private:
const std::string & machine, BuildStepStatus status, const std::string & errorMsg = "",
BuildID propagatedFrom = 0);
void finishBuildStep(pqxx::work & txn, time_t startTime, time_t stopTime, BuildID buildId, int stepNr,
void finishBuildStep(pqxx::work & txn, time_t startTime, time_t stopTime,
unsigned int overhead, BuildID buildId, int stepNr,
const std::string & machine, BuildStepStatus status, const std::string & errorMsg = "",
BuildID propagatedFrom = 0);