snaakey/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Truncate the log just before starting the remote build

Browse source 
This gets rid of all those remote substitution messages that were
polluting the build logs.
This commit is contained in:
Eelco Dolstra 2016-10-26 13:39:43 +02:00
parent a12e9478e7
commit 8e1d791d0c
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/hydra-queue-runner/build-remote.cc
View file

@ -136,8 +136,6 @@ void State::buildRemote(ref<Store> destStore,
Child child; Child child;
openConnection(machine, tmpDir, logFD.get(), child); openConnection(machine, tmpDir, logFD.get(), child);
logFD = -1;
FdSource from(child.from.get()); FdSource from(child.from.get());
FdSink to(child.to.get()); FdSink to(child.to.get());
@ -223,6 +221,16 @@ void State::buildRemote(ref<Store> destStore,
autoDelete.cancel(); autoDelete.cancel();
/* Truncate the log to get rid of messages about substitutions
etc. on the remote system. */
if (lseek(logFD.get(), SEEK_SET, 0) != 0)
throw SysError("seeking to the start of log file ‘%s’", result.logFile);
if (ftruncate(logFD.get(), 0) == -1)
throw SysError("truncating log file ‘%s’", result.logFile);
logFD = -1;
/* Do the build. */ /* Do the build. */
printMsg(lvlDebug, format("building ‘%1%’ on ‘%2%’") % step->drvPath % machine->sshName); printMsg(lvlDebug, format("building ‘%1%’ on ‘%2%’") % step->drvPath % machine->sshName);