diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06T15·33+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06T15·33+0200 |
| commit | 1abda8e17311fbfc27b751b90aff4f691f496b0f (patch) | |
| tree | f5ea0a3faa048610cffddcebfa0ee9f022a21440 /src/nix-store/nix-store.cc | |
| parent | 9ffc4f4363d9596e2477645eab94e4140cd47c19 (diff) | |
nix-store --serve: Implement log size limit
Diffstat (limited to 'src/nix-store/nix-store.cc')
| -rw-r--r-- | src/nix-store/nix-store.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc index d541b7b7d0..89518bfb1b 100644 --- a/src/nix-store/nix-store.cc +++ b/src/nix-store/nix-store.cc @@ -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) { |