Skip to content

Commit

Permalink
server: revert socket interface initialization change
Browse files Browse the repository at this point in the history
Signed-off-by: Xie Zhihao <[email protected]>
  • Loading branch information
zhxie committed May 30, 2023
1 parent 749261a commit 26a9c88
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions source/server/server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -620,18 +620,13 @@ void InstanceImpl::initialize(Network::Address::InstanceConstSharedPtr local_add
std::move(safe_actions), std::move(unsafe_actions), api_->threadFactory());
}

Network::SocketInterface* sock = nullptr;
if (!bootstrap_.default_socket_interface().empty()) {
auto& sock_name = bootstrap_.default_socket_interface();
sock = const_cast<Network::SocketInterface*>(Network::socketInterface(sock_name));
ASSERT(sock != nullptr);
Network::SocketInterfaceSingleton::clear();
Network::SocketInterfaceSingleton::initialize(sock);
} else {
auto factory = dynamic_cast<Server::Configuration::BootstrapExtensionFactory*>(
Network::SocketInterfaceSingleton::getExisting());
bootstrap_extensions_.push_back(factory->createBootstrapExtension(
*factory->createEmptyConfigProto(), serverFactoryContext()));
auto sock = const_cast<Network::SocketInterface*>(Network::socketInterface(sock_name));
if (sock != nullptr) {
Network::SocketInterfaceSingleton::clear();
Network::SocketInterfaceSingleton::initialize(sock);
}
}

ListenerManagerFactory* listener_manager_factory = nullptr;
Expand Down

0 comments on commit 26a9c88

Please sign in to comment.