maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Some hackery to propagate the worker's stderr and exceptions to the

Browse source 
client.
This commit is contained in:
Eelco Dolstra 2006-12-03 02:08:13 +00:00
parent 714fa24cfb
commit 7951c3c546
7 changed files with 209 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/libstore/remote-store.cc
View file

@ -4,6 +4,10 @@
#include "worker-protocol.hh"
#include "archive.hh"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <iostream>
#include <unistd.h>
@ -38,9 +42,15 @@ RemoteStore::RemoteStore()
if (dup2(toChild.readSide, STDIN_FILENO) == -1)
throw SysError("dupping read side");
execlp(worker.c_str(), worker.c_str(),
"--slave", NULL);
int fdDebug = open("/tmp/worker-log", O_WRONLY | O_CREAT | O_TRUNC, 0644);
assert(fdDebug != -1);
if (dup2(fdDebug, STDERR_FILENO) == -1)
throw SysError("dupping stderr");
close(fdDebug);
execlp(worker.c_str(), worker.c_str(),
"-vvv", "--slave", NULL);
throw SysError(format("executing `%1%'") % worker);
} catch (std::exception & e) {
@ -66,9 +76,13 @@ RemoteStore::RemoteStore()
RemoteStore::~RemoteStore()
{
writeInt(wopQuit, to);
readInt(from);
child.wait(true);
try {
fromChild.readSide.close();
toChild.writeSide.close();
child.wait(true);
} catch (Error & e) {
printMsg(lvlError, format("error (ignored): %1%") % e.msg());
}
}
@ -158,6 +172,7 @@ void RemoteStore::buildDerivations(const PathSet & drvPaths)
{
writeInt(wopBuildDerivations, to);
writeStringSet(drvPaths, to);
processStderr();
readInt(from);
}
@ -185,4 +200,18 @@ void RemoteStore::syncWithGC()
}
void RemoteStore::processStderr()
{
unsigned int msg;
while ((msg = readInt(from)) == STDERR_NEXT) {
string s = readString(from);
writeToStderr((unsigned char *) s.c_str(), s.size());
}
if (msg == STDERR_ERROR)
throw Error(readString(from));
else if (msg != STDERR_LAST)
throw Error("protocol error processing standard error");
}
}