diff options
Diffstat (limited to 'messagebus/src')
4 files changed, 11 insertions, 19 deletions
diff --git a/messagebus/src/vespa/messagebus/network/identity.cpp b/messagebus/src/vespa/messagebus/network/identity.cpp index 9bc6e2ab657..17424c1b8a3 100644 --- a/messagebus/src/vespa/messagebus/network/identity.cpp +++ b/messagebus/src/vespa/messagebus/network/identity.cpp @@ -12,7 +12,7 @@ Identity::Identity(const string &configId) : _hostname = vespalib::HostName::get(); } -Identity::~Identity() {} +Identity::~Identity() = default; std::vector<string> Identity::split(const string &name) diff --git a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp index b6f0231e619..bd87e4dbbe2 100644 --- a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp +++ b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.cpp @@ -4,9 +4,13 @@ namespace mbus { -RPCNetworkParams::RPCNetworkParams() : +RPCNetworkParams::RPCNetworkParams() + : RPCNetworkParams("admin/slobrok.0") +{ } + +RPCNetworkParams::RPCNetworkParams(config::ConfigUri configUri) : _identity(Identity("")), - _slobrokConfig("admin/slobrok.0"), + _slobrokConfig(std::move(configUri)), _listenPort(0), _maxInputBufferSize(256*1024), _maxOutputBufferSize(256*1024), diff --git a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.h b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.h index 1dcc8178e68..d2529ea301d 100644 --- a/messagebus/src/vespa/messagebus/network/rpcnetworkparams.h +++ b/messagebus/src/vespa/messagebus/network/rpcnetworkparams.h @@ -27,6 +27,7 @@ private: public: RPCNetworkParams(); + RPCNetworkParams(config::ConfigUri configUri); ~RPCNetworkParams(); /** @@ -69,17 +70,6 @@ public: } /** - * Sets of the slobrok config. - * - * @param slobrokConfigId The new config. - * @return This, to allow chaining. - */ - RPCNetworkParams &setSlobrokConfig(const config::ConfigUri & slobrokConfig) { - _slobrokConfig = slobrokConfig; - return *this; - } - - /** * Returns the port to listen to. * * @return The port. diff --git a/messagebus/src/vespa/messagebus/testlib/testserver.cpp b/messagebus/src/vespa/messagebus/testlib/testserver.cpp index a2489aac9ce..bbd23d52c0b 100644 --- a/messagebus/src/vespa/messagebus/testlib/testserver.cpp +++ b/messagebus/src/vespa/messagebus/testlib/testserver.cpp @@ -23,10 +23,8 @@ TestServer::TestServer(const Identity &ident, const RoutingSpec &spec, const Slobrok &slobrok, IProtocol::SP protocol) : - net(RPCNetworkParams() - .setIdentity(ident) - .setSlobrokConfig(slobrok.config())), - mb(net, ProtocolSet().add(IProtocol::SP(new SimpleProtocol())).add(protocol)) + net(RPCNetworkParams(slobrok.config()).setIdentity(ident)), + mb(net, ProtocolSet().add(std::make_shared<SimpleProtocol>()).add(protocol)) { mb.setupRouting(spec); } @@ -37,7 +35,7 @@ TestServer::TestServer(const MessageBusParams &mbusParams, mb(net, mbusParams) {} -TestServer::~TestServer() {} +TestServer::~TestServer() = default; bool TestServer::waitSlobrok(const string &pattern, uint32_t cnt) |