Logging

Author: kdimentionaltree

ton-http-api/src/converters/send.hpp

@@ -2,7 +2,6 @@
 #include "auto/tl/tonlib_api.h"
 #include "schemas/v2.hpp"
 
-
 namespace ton_http::converters {
 
 using namespace ton;

ton-http-api/src/handlers/TonlibRequestHandler.h

@@ -112,8 +112,9 @@ class TonlibRequestHandler : public userver::server::handlers::HttpHandlerBase {
   std::string HandleRequestThrow(const HttpRequest& request, RequestContext& context) const override {
     auto session = tonlib_component_.GetNewSession();
     schemas::v2::TonlibErrorResponse error_response;
+    Request tonlib_request;
     try {
-      auto tonlib_request = ParseTonlibRequestThrow(request, context);
+      tonlib_request = ParseTonlibRequestThrow(request, context);
       auto tonlib_response = HandleRequestTonlibThrow(tonlib_request, session);
       if (tonlib_response.is_error()) {
         auto tonlib_error = tonlib_response.move_as_error();
@@ -129,7 +130,10 @@ class TonlibRequestHandler : public userver::server::handlers::HttpHandlerBase {
       if (use_custom_serializer_) {
         throw std::runtime_error("not implemented");
       }
-      return ToString(userver::formats::json::ValueBuilder{response}.ExtractValue());
+
+      auto response_body = userver::formats::json::ValueBuilder{response}.ExtractValue();
+      LogTonlibRequest(request, context, tonlib_request, response_body, std::nullopt, userver::logging::Level::kInfo);
+      return ToString(response_body);
     } catch (const utils::TonlibException& error) {
       error_response = PrepareErrorResponse(error);
     } catch (const std::exception& exc) {
@@ -142,7 +146,10 @@ class TonlibRequestHandler : public userver::server::handlers::HttpHandlerBase {
     auto& http_response = request.GetHttpResponse();
     http_response.SetContentType(userver::http::content_type::kApplicationJson);
     http_response.SetStatus(static_cast<userver::server::http::HttpStatus>(error_response.code));
-    return ToString(userver::formats::json::ValueBuilder{error_response}.ExtractValue());
+
+    auto response_body = userver::formats::json::ValueBuilder{error_response}.ExtractValue();
+    LogTonlibRequest(request, context, tonlib_request, std::nullopt, response_body, userver::logging::Level::kWarning);
+    return ToString(response_body);
   }
   TonlibRequestHandler(
     const userver::components::ComponentConfig& config, const userver::components::ComponentContext& context
@@ -155,6 +162,28 @@ class TonlibRequestHandler : public userver::server::handlers::HttpHandlerBase {
       use_custom_serializer_(config["use_custom_serializer"].As<bool>(false)) {
   }
 
+  void LogTonlibRequest(
+    const HttpRequest& request,
+    RequestContext&,
+    const Request& req,
+    std::optional<userver::formats::json::Value> response = std::nullopt,
+    std::optional<userver::formats::json::Value> error = std::nullopt,
+    const userver::logging::Level log_level = userver::logging::Level::kInfo
+  ) const {
+    userver::logging::LogExtra log_extra;
+    log_extra.Extend("http_method", request.GetMethodStr());
+    log_extra.Extend("api_method", request.GetRequestPath());
+    auto request_body = userver::formats::json::ValueBuilder{req}.ExtractValue();
+    log_extra.Extend("request", request_body);
+    if (response.has_value()) {
+      log_extra.Extend("response", response.value());
+    }
+    if (error.has_value()) {
+      log_extra.Extend("response", error.value());
+    }
+    LOG_TO(*logger_, log_level) << log_extra;
+  }
+
   static userver::yaml_config::Schema GetStaticConfigSchema() {
     return userver::yaml_config::MergeSchemas<HttpHandlerBase>(R"(
 type: object

ton-http-api/src/handlers/transactions/GetBlockTransactionsExtHandler.cpp

@@ -78,7 +78,7 @@ td::Status ton_http::handlers::GetBlockTransactionsExtHandler::ValidateRequest(
     return td::Status::Error(422, "count should be positive");
   }
   if (request.count > 2000) {
-    return td::Status::Error(422, "count should be less or equal 100");
+    return td::Status::Error(422, "count should be less or equal 2000");
   }
   if (request.seqno <= 0) {
     return td::Status::Error(422, "seqno should be positive");

ton-http-api/src/handlers/transactions/GetBlockTransactionsHandler.cpp

@@ -78,7 +78,7 @@ td::Status ton_http::handlers::GetBlockTransactionsHandler::ValidateRequest(
     return td::Status::Error(422, "count should be positive");
   }
   if (request.count > 2000) {
-    return td::Status::Error(422, "count should be less or equal 100");
+    return td::Status::Error(422, "count should be less or equal 2000");
   }
   if (request.seqno <= 0) {
     return td::Status::Error(422, "seqno should be positive");