diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-04 10:30:43 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-04 10:30:43 +0000 |
commit | 4f4839e5cd517f5db076193da25ff2aaca2ca513 (patch) | |
tree | a1a0ea493148b45ec4a299cd8d056a825cdfbee5 /messagebus/src | |
parent | 4324d82a2cdf6f79279f9804e9a42dc229813673 (diff) |
Always use protobuf protocol
Diffstat (limited to 'messagebus/src')
-rw-r--r-- | messagebus/src/vespa/messagebus/network/rpcnetwork.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp index 3599142d69c..ca565825dc4 100644 --- a/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcnetwork.cpp @@ -151,25 +151,10 @@ RPCNetwork::flushTargetPool() _targetPool->flushTargets(true); } -namespace { - -[[nodiscard]] vespalib::Version derive_supported_protocol_version() { - // TODO remove this hilariously leaky abstraction once protobuf protocol is the default :D - // Disallow-version MUST be lower than that used as a protocol lower bound in documentprotocol.cpp - // and the exact same as that used in Java for the same purposes. Or else! - const char* maybe_env_val = getenv("VESPA_MBUS_DOCUMENTAPI_USE_PROTOBUF"); - if (maybe_env_val && (("true"sv == maybe_env_val) || ("yes"sv == maybe_env_val))) { - return {8, 310}; // _Allows_ new protobuf protocol - } - return {8, 309}; // _Disallows_ new protobuf protocol -} - -} - const vespalib::Version & RPCNetwork::getVersion() const { - static vespalib::Version reported_version = derive_supported_protocol_version(); + static vespalib::Version reported_version(8, 310) // _Allows_ new protobuf protocol; return reported_version; } |