forked from lix-project/lix
Nix daemon: respect build timeout from the client
This commit is contained in:
parent
08d96ffad0
commit
934cf2d1f4
|
@ -3231,7 +3231,7 @@ void Worker::waitForInput()
|
|||
after - before >= (time_t) settings.buildTimeout)
|
||||
{
|
||||
printMsg(lvlError,
|
||||
format("%1% timed out after %2% seconds of activity")
|
||||
format("%1% timed out after %2% seconds")
|
||||
% goal->getName() % settings.buildTimeout);
|
||||
goal->cancel();
|
||||
}
|
||||
|
|
|
@ -551,6 +551,9 @@ static void performOp(unsigned int clientVersion,
|
|||
for (unsigned int i = 0; i < n; i++) {
|
||||
string name = readString(from);
|
||||
string value = readString(from);
|
||||
if (name == "build-timeout")
|
||||
string2Int(value, settings.buildTimeout);
|
||||
else
|
||||
settings.set("untrusted-" + name, value);
|
||||
}
|
||||
}
|
||||
|
@ -895,8 +898,6 @@ static void daemonLoop()
|
|||
|
||||
void run(Strings args)
|
||||
{
|
||||
bool daemon = false;
|
||||
|
||||
for (Strings::iterator i = args.begin(); i != args.end(); ) {
|
||||
string arg = *i++;
|
||||
if (arg == "--daemon") /* ignored for backwards compatibility */;
|
||||
|
|
Loading…
Reference in a new issue