Merge pull request #746 from evoskuil/master

Restore implementation of send proxy logging.

Author: evoskuil

include/bitcoin/network/channels/channel_peer.hpp

@@ -58,20 +58,26 @@ class BCT_API channel_peer
     inline void send(const Message& message, result_handler&& handler) NOEXCEPT
     {
         BC_ASSERT(stranded());
+        using namespace messages::peer;
 
         // TODO: move to serializer.
         const auto magic = settings().identifier;
         const auto version = negotiated_version();
-        const auto ptr = messages::peer::serialize(message, magic, version);
+        const auto payload = serialize(message, magic, version);
+
+        LOGX("Sent " << heading::get_command(*payload) << " to ["
+            << endpoint() << "] (" << system::floored_subtract(payload->size(),
+            heading::command_size) << " bytes)");
 
         using namespace std::placeholders;
         count_handler complete = std::bind(&channel_peer::handle_send,
-            shared_from_base<channel_peer>(),  _1, _2, ptr, std::move(handler));
+            shared_from_base<channel_peer>(),  _1, _2, payload,
+            std::move(handler));
 
-        if (!ptr)
+        if (!payload)
             complete(error::bad_alloc, {});
         else
-            write({ ptr->data(), ptr->size() }, std::move(complete));
+            write({ payload->data(), payload->size() }, std::move(complete));
     }
 
     /// Construct a p2p channel to encapsulate and communicate on the socket.
@@ -138,7 +144,8 @@ class BCT_API channel_peer
 
 private:
     void log_message(const std::string_view& name, size_t size) const NOEXCEPT;
-    void handle_send(const code& ec, size_t size, const system::chunk_cptr&,
+    void handle_send(const code& ec, size_t size,
+        const system::chunk_cptr& payload,
         const result_handler& handler) NOEXCEPT;
 
     // Only passes static member get_area(), so safe to use statically.

src/channels/channel_peer.cpp

@@ -317,11 +317,21 @@ void channel_peer::handle_read_payload(const code& ec, size_t payload_size,
 }
 
 void channel_peer::handle_send(const code& ec, size_t,
-    const system::chunk_cptr&, const result_handler& handler) NOEXCEPT
+    const system::chunk_cptr& payload, const result_handler& handler) NOEXCEPT
 {
     if (ec)
         stop(ec);
 
+    if (ec &&
+        ec != error::peer_disconnect &&
+        ec != error::operation_canceled &&
+        ec != error::connect_failed)
+    {
+        LOGF("Send failure " << heading::get_command(*payload) << " to ["
+            << endpoint() << "] (" << system::floored_subtract(payload->size(),
+                heading::command_size) << " bytes) " << ec.message());
+    }
+
     handler(ec);
 }
 

src/net/proxy.cpp

@@ -283,7 +283,7 @@ void proxy::do_write(const asio::const_buffer& payload,
     total_ = ceilinged_add(total_.load(), payload.size());
     backlog_ = ceilinged_add(backlog_.load(), payload.size());
 
-    LOGX("Queue for [" << endpoint() << "]: " << queue_.size()
+    LOGV("Queue for [" << endpoint() << "]: " << queue_.size()
         << " (" << backlog_.load() << " of " << total_.load() << " bytes)");
 
     // Start the loop if it wasn't already started.
@@ -322,7 +322,7 @@ void proxy::handle_write(const code& ec, size_t bytes,
     backlog_ = floored_subtract(backlog_.load(), queue_.front().first.size());
     queue_.pop_front();
 
-    LOGX("Dequeue for [" << endpoint() << "]: " << queue_.size()
+    LOGV("Dequeue for [" << endpoint() << "]: " << queue_.size()
         << " (" << backlog_.load() << " backlog)");
 
     // All handlers must be invoked, so continue regardless of error state.
@@ -346,11 +346,6 @@ void proxy::handle_write(const code& ec, size_t bytes,
         return;
     }
 
-    // BUGBUG: payload changed from data_chunk_ptr to const_buffer.
-    // TODO: messages dependency, move to channel.
-    ////LOGX("Sent " <<  heading::get_command(*payload) << " to ["
-    ////    << endpoint() << "] (" << payload->size() << " bytes)");
-
     handler(ec, bytes);
 }