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

nix-store --serve: Monitor for client disconnects

Browse source 
This is necessary because build-remote.pl now builds via ‘nix-store
--serve’. So if a build hangs without writing to stdout/stderr, and
the client disconnects, then we need to detect that.
This commit is contained in:
Eelco Dolstra 2014-07-23 19:26:34 +02:00
parent 49fe9592a4
commit 78224cd871
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/nix-store/nix-store.cc
View file

@ -8,6 +8,7 @@
#include "util.hh" #include "util.hh"
#include "serve-protocol.hh" #include "serve-protocol.hh"
#include "worker-protocol.hh" #include "worker-protocol.hh"
#include "monitor-fd.hh"
#include <iostream> #include <iostream>
#include <algorithm> #include <algorithm>
@ -879,6 +880,8 @@ static void opServe(Strings opFlags, Strings opArgs)
FdSource in(STDIN_FILENO); FdSource in(STDIN_FILENO);
FdSink out(STDOUT_FILENO); FdSink out(STDOUT_FILENO);
MonitorFdHup monitor(in.fd);
/* Exchange the greeting. */ /* Exchange the greeting. */
unsigned int magic = readInt(in); unsigned int magic = readInt(in);
if (magic != SERVE_MAGIC_1) throw Error("protocol mismatch"); if (magic != SERVE_MAGIC_1) throw Error("protocol mismatch");