lix-project/lix
20
55
Fork 31
Code Issues 344 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Improve error message if the daemon worker fails to start

Browse source
This commit is contained in:
Eelco Dolstra 2014-10-31 09:36:09 +01:00
parent 1cdbb9d724
commit e389f4ea55
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -87,8 +87,7 @@ void RemoteStore::openConnection(bool reserveSpace)
processStderr(); processStderr();
} }
catch (Error & e) { catch (Error & e) {
throw Error(format("cannot start worker (%1%)") throw Error(format("cannot start daemon worker: %1%") % e.msg());
% e.msg());
} }
setOptions(); setOptions();

2
src/nix-daemon/nix-daemon.cc
View file

@ -565,7 +565,7 @@ static void processConnection(bool trusted)
to.flush(); to.flush();
} catch (Error & e) { } catch (Error & e) {
stopWork(false, e.msg()); stopWork(false, e.msg(), GET_PROTOCOL_MINOR(clientVersion) >= 8 ? 1 : 0);
to.flush(); to.flush();
return; return;
} }