Merge pull request #617 from evoskuil/master

LOGP request/response messages.

Author: evoskuil

include/bitcoin/network/channels/channel_http.hpp

@@ -67,9 +67,13 @@ class BCT_API channel_http
             shared_from_base<channel_http>(), _1, _2, ptr, std::move(handler));
 
         if (!ptr)
+        {
             complete(error::bad_alloc, {});
-        else
-            write(*ptr, std::move(complete));
+            return;
+        }
+
+        log_message(*ptr);
+        write(*ptr, std::move(complete));
     }
 
     /// response_buffer_ is initialized to default size, see set_buffer().
@@ -119,6 +123,9 @@ class BCT_API channel_http
     void handle_read_request(const code& ec, size_t bytes_read,
         const http::request_cptr& request) NOEXCEPT;
 
+    void log_message(const http::request& request) const NOEXCEPT;
+    void log_message(const http::response& response) const NOEXCEPT;
+
     // These are protected by strand.
     http::flat_buffer_ptr response_buffer_;
     http::flat_buffer request_buffer_;

include/bitcoin/network/messages/http/enums/mime_type.hpp

@@ -66,6 +66,7 @@ BCT_API mime_type content_mime_type(const std::string_view& content_type,
     mime_type default_=mime_type::unknown) NOEXCEPT;
 BCT_API mime_type content_mime_type(const http::fields& fields,
     mime_type default_ = mime_type::unknown) NOEXCEPT;
+
 BCT_API mime_type extension_mime_type(const std::string_view& extension,
     mime_type default_=mime_type::unknown) NOEXCEPT;
 BCT_API mime_type file_mime_type(const std::filesystem::path& path,

include/bitcoin/network/messages/http/enums/status.hpp

@@ -28,6 +28,13 @@ namespace http {
 /// Status is aliased to beast boost define.
 using status = boost::beast::http::status;
 
+inline std::string status_string(status code) NOEXCEPT
+{
+    BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
+    return boost::beast::http::obsolete_reason(code);
+    BC_POP_WARNING()
+}
+
 } // namespace http
 } // namespace network
 } // namespace libbitcoin

src/channels/channel_http.cpp

@@ -19,9 +19,10 @@
 #include <bitcoin/network/channels/channel_http.hpp>
 
 #include <bitcoin/network/async/async.hpp>
+#include <bitcoin/network/channels/channel.hpp>
 #include <bitcoin/network/define.hpp>
 #include <bitcoin/network/log/log.hpp>
-#include <bitcoin/network/channels/channel.hpp>
+#include <bitcoin/network/messages/http/http.hpp>
 #include <bitcoin/network/settings.hpp>
 
 namespace libbitcoin {
@@ -107,9 +108,44 @@ void channel_http::handle_read_request(const code& ec, size_t,
         return;
     }
 
+    log_message(*request);
     distributor_.notify(request);
 }
 
+// log helpers
+// ----------------------------------------------------------------------------
+
+void channel_http::log_message(const http::request& request) const NOEXCEPT
+{
+    LOG_ONLY(const auto size = serialize(request.payload_size()
+        .has_value() ? request.payload_size().value() : zero);)
+
+    LOG_ONLY(const auto version = "http/" + serialize(request.version() / 10) +
+        "." + serialize(request.version() % 10);)
+        
+    LOGP("Request [" << request.method_string()
+        << "] " << version << " (" << (request.chunked() ? "c" : size)
+        << ") " << (request.keep_alive() ? "keep" : "drop")
+        << " [" << authority() << "]"
+        << " {" << (split(request[http::field::accept], ",").front()) << "...}"
+        << " "  << request.target());
+}
+
+void channel_http::log_message(const http::response& response) const NOEXCEPT
+{
+    LOG_ONLY(const auto size = serialize(response.payload_size()
+        .has_value() ? response.payload_size().value() : zero);)
+
+    LOG_ONLY(const auto version = "http/" + serialize(response.version() / 10)
+        + "." + serialize(response.version() % 10);)
+        
+    LOGP("Response [" << http::status_string(response.result())
+        << "] " << version << " (" << (response.chunked() ? "c" : size)
+        << ") " << (response.keep_alive() ? "keep" : "drop")
+        << " [" << authority() << "]"
+        << " {" << (response[http::field::content_type]) << "}");
+}
+
 BC_POP_WARNING()
 BC_POP_WARNING()
 BC_POP_WARNING()

test/channels/channel_http.cpp

@@ -200,7 +200,7 @@ BOOST_AUTO_TEST_CASE(channel_http__send__not_connected__expected)
     BOOST_REQUIRE(!channel_ptr->stopped());
     boost::asio::post(channel_ptr->strand(), [&]() NOEXCEPT
     {
-        channel_ptr->send<http::string_response>({}, handler);
+        channel_ptr->send<http::response>({}, handler);
     });
 
     // 10009 (WSAEBADF, invalid file handle) gets mapped to bad_stream.
@@ -227,7 +227,7 @@ BOOST_AUTO_TEST_CASE(channel_http__send__not_connected_move__expected)
     BOOST_REQUIRE(!channel_ptr->stopped());
     boost::asio::post(channel_ptr->strand(), [&]() NOEXCEPT
     {
-        channel_ptr->send(http::string_response{}, [&](code ec)
+        channel_ptr->send(http::response{}, [&](code ec)
         {
             result &= channel_ptr->stopped();
             promise.set_value(ec);