wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-02 17:41:48 +02:00
Code Activity

nix-store --serve: Implement log size limit

Browse source
This commit is contained in:
Eelco Dolstra 2015-10-06 17:33:30 +02:00
parent 9ffc4f4363
commit 1abda8e173
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -853,7 +853,7 @@ static void opServe(Strings opFlags, Strings opArgs)
if (magic != SERVE_MAGIC_1) throw Error("protocol mismatch");
out << SERVE_MAGIC_2 << SERVE_PROTOCOL_VERSION;
out.flush();
readInt(in); // Client version, unused for now
unsigned int clientVersion = readInt(in);
auto getBuildSettings = [&]() {
// FIXME: changing options here doesn't work if we're
@ -863,6 +863,8 @@ static void opServe(Strings opFlags, Strings opArgs)
settings.useSubstitutes = false;
settings.maxSilentTime = readInt(in);
settings.buildTimeout = readInt(in);
if (GET_PROTOCOL_MINOR(clientVersion) >= 2)
settings.maxLogSize = readInt(in);
};
while (true) {

2
src/nix-store/serve-protocol.hh
View file

@ -5,7 +5,7 @@ namespace nix {
#define SERVE_MAGIC_1 0x390c9deb
#define SERVE_MAGIC_2 0x5452eecb
#define SERVE_PROTOCOL_VERSION 0x201
#define SERVE_PROTOCOL_VERSION 0x202
#define GET_PROTOCOL_MAJOR(x) ((x) & 0xff00)
#define GET_PROTOCOL_MINOR(x) ((x) & 0x00ff)