Skip to content
Snippets Groups Projects
Commit 8ff0c979 authored by Adrien Béraud's avatar Adrien Béraud
Browse files

proxy server: cleanup

parent 913cb543
Branches
No related tags found
No related merge requests found
...@@ -71,33 +71,26 @@ constexpr const std::chrono::minutes PRINT_STATS_PERIOD {2}; ...@@ -71,33 +71,26 @@ constexpr const std::chrono::minutes PRINT_STATS_PERIOD {2};
class opendht_logger_t class opendht_logger_t
{ {
public: public:
opendht_logger_t(std::shared_ptr<Logger> logger = {}){ opendht_logger_t(std::shared_ptr<Logger> logger = {}) : m_logger(std::move(logger)) {}
if (logger)
m_logger = logger;
}
template <typename Builder> template <typename Builder>
void trace(Builder&& msg_builder) { void trace(Builder&& msg_builder) {
if (m_logger) /* if (m_logger) m_logger->d("[proxy:server] %s", msg_builder().c_str()); */
m_logger->d("[proxy:server] %s", msg_builder().c_str());
} }
template <typename Builder> template <typename Builder>
void info(Builder&& msg_builder) { void info(Builder&& msg_builder) {
if (m_logger) if (m_logger) m_logger->d("[proxy:server] %s", msg_builder().c_str());
m_logger->d("[proxy:server] %s", msg_builder().c_str());
} }
template <typename Builder> template <typename Builder>
void warn(Builder&& msg_builder) { void warn(Builder&& msg_builder) {
if (m_logger) if (m_logger) m_logger->w("[proxy:server] %s", msg_builder().c_str());
m_logger->w("[proxy:server] %s", msg_builder().c_str());
} }
template <typename Builder> template <typename Builder>
void error(Builder&& msg_builder) { void error(Builder&& msg_builder) {
if (m_logger) if (m_logger) m_logger->e("[proxy:server] %s", msg_builder().c_str());
m_logger->e("[proxy:server] %s", msg_builder().c_str());
} }
private: private:
...@@ -1192,17 +1185,16 @@ DhtProxyServer::getFiltered(restinio::request_handle_t request, ...@@ -1192,17 +1185,16 @@ DhtProxyServer::getFiltered(restinio::request_handle_t request,
initHttpResponse(request->create_response<ResponseByParts>())); initHttpResponse(request->create_response<ResponseByParts>()));
response->flush(); response->flush();
try { try {
dht_->get(infoHash, [this, response](const Sp<Value>& value){ dht_->get(infoHash,
auto output = Json::writeString(jsonBuilder_, value->toJson()) + "\n"; [this, response](const Sp<Value>& value) {
response->append_chunk(output); response->append_chunk(Json::writeString(jsonBuilder_, value->toJson()) + "\n");
response->flush(); response->flush();
return true; return true;
}, },
[response] (bool /*ok*/){ [response] (bool /*ok*/){
response->done(); response->done();
}, },
{}, value {}, value);
);
} catch (const std::exception& e){ } catch (const std::exception& e){
auto response = initHttpResponse( auto response = initHttpResponse(
request->create_response(restinio::status_internal_server_error())); request->create_response(restinio::status_internal_server_error()));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment