maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix doctor: handle serve protocol

Browse source 
The serve protocol used by LegacySSHStore has a different major and
shouldn't be compared to PROTOCOL_VERSION.
This commit is contained in:
Daiderd Jordan 2018-08-31 01:01:59 +02:00
parent 7314dc7f07
commit 246acf93f2
No known key found for this signature in database
GPG key ID: D02435D05B810C96
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/nix/doctor.cc
View file

@ -1,4 +1,5 @@
#include "command.hh" #include "command.hh"
#include "serve-protocol.hh"
#include "shared.hh" #include "shared.hh"
#include "store-api.hh" #include "store-api.hh"
#include "worker-protocol.hh" #include "worker-protocol.hh"
@ -35,14 +36,18 @@ struct CmdDoctor : StoreCommand
checkStoreProtocol(store->getProtocol()); checkStoreProtocol(store->getProtocol());
} }
void checkStoreProtocol(unsigned int proto) { void checkStoreProtocol(unsigned int storeProto) {
if (PROTOCOL_VERSION != proto) { auto clientProto = GET_PROTOCOL_MAJOR(SERVE_PROTOCOL_VERSION) == GET_PROTOCOL_MAJOR(storeProto)
? SERVE_PROTOCOL_VERSION
: PROTOCOL_VERSION;
if (clientProto != storeProto) {
std::cout << "Warning: protocol version of this client does not match the store." << std::endl; std::cout << "Warning: protocol version of this client does not match the store." << std::endl;
std::cout << "While this is not necessarily a problem it's recommended to keep the client in" << std::endl; std::cout << "While this is not necessarily a problem it's recommended to keep the client in" << std::endl;
std::cout << "sync with the daemon." << std::endl; std::cout << "sync with the daemon." << std::endl;
std::cout << std::endl; std::cout << std::endl;
std::cout << "Client protocol: " << formatProtocol(PROTOCOL_VERSION) << std::endl; std::cout << "Client protocol: " << formatProtocol(clientProto) << std::endl;
std::cout << "Store protocol: " << formatProtocol(proto) << std::endl; std::cout << "Store protocol: " << formatProtocol(storeProto) << std::endl;
std::cout << std::endl; std::cout << std::endl;
} }
} }