ARCHIVE/clio
1
0
Fork 0
mirror of https://github.com/XRPLF/clio.git synced 2026-06-03 16:56:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Replace all old instances of Config with New Config (#1627)

Browse Source 
Fixes #1184 
Previous PR's found [here](https://github.com/XRPLF/clio/pull/1593) and
[here](https://github.com/XRPLF/clio/pull/1544)
This commit is contained in:
Peter Chen
2024-12-16 15:33:32 -08:00
committed by GitHub
parent b53cfd0ec1
commit 3c4903a339
103 changed files with 1624 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/web/ng/Server.cpp
View File

@@ -21,8 +21,9 @@
#include "util/Assert.hpp"
#include "util/Taggable.hpp"
#include "util/config/Config.hpp"
#include "util/log/Logger.hpp"
#include "util/newconfig/ConfigDefinition.hpp"
#include "util/newconfig/ObjectView.hpp"
#include "web/ng/Connection.hpp"
#include "web/ng/MessageHandler.hpp"
#include "web/ng/ProcessingPolicy.hpp"
@@ -56,22 +57,17 @@ namespace web::ng {
namespace {
std::expected<boost::asio::ip::tcp::endpoint, std::string>
makeEndpoint(util::Config const& serverConfig)
makeEndpoint(util::config::ObjectView const& serverConfig)
{
auto const ip = serverConfig.maybeValue<std::string>("ip");
if (not ip.has_value())
return std::unexpected{"Missing 'ip` in server config."};
auto const ip = serverConfig.get<std::string>("ip");
boost::system::error_code error;
auto const address = boost::asio::ip::make_address(*ip, error);
auto const address = boost::asio::ip::make_address(ip, error);
if (error)
return std::unexpected{fmt::format("Error parsing provided IP: {}", error.message())};
auto const port = serverConfig.maybeValue<unsigned short>("port");
if (not port.has_value())
return std::unexpected{"Missing 'port` in server config."};
return boost::asio::ip::tcp::endpoint{address, *port};
auto const port = serverConfig.get<unsigned short>("port");
return boost::asio::ip::tcp::endpoint{address, port};
}
std::expected<boost::asio::ip::tcp::acceptor, std::string>
@@ -305,13 +301,13 @@ Server::handleConnection(boost::asio::ip::tcp::socket socket, boost::asio::yield
std::expected<Server, std::string>
make_Server(
util::Config const& config,
util::config::ClioConfigDefinition const& config,
Server::OnConnectCheck onConnectCheck,
Server::OnDisconnectHook onDisconnectHook,
boost::asio::io_context& context
)
{
auto const serverConfig = config.section("server");
auto const serverConfig = config.getObject("server");
auto endpoint = makeEndpoint(serverConfig);
if (not endpoint.has_value())
@@ -324,7 +320,7 @@ make_Server(
ProcessingPolicy processingPolicy{ProcessingPolicy::Parallel};
std::optional<size_t> parallelRequestLimit;
auto const processingStrategyStr = serverConfig.valueOr<std::string>("processing_policy", "parallel");
auto const processingStrategyStr = serverConfig.get<std::string>("processing_policy");
if (processingStrategyStr == "sequent") {
processingPolicy = ProcessingPolicy::Sequential;
} else if (processingStrategyStr == "parallel") {
@@ -333,7 +329,7 @@ make_Server(
return std::unexpected{fmt::format("Invalid 'server.processing_strategy': {}", processingStrategyStr)};
}
auto const maxSubscriptionSendQueueSize = serverConfig.maybeValue<size_t>("ws_max_sending_queue_size");
auto const maxSubscriptionSendQueueSize = serverConfig.get<size_t>("ws_max_sending_queue_size");
return Server{
context,