Merge pull request #901 from hyperxor/more_traces_to_peer_to_debug

More traces to Peer class, http server test and change id generation
pistacheio · Apr 13, 2021 · a998e29 · a998e29
2 parents 361f2ff + 2bcdf0c
commit a998e29
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/include/pistache/peer.h b/include/pistache/peer.h
@@ -60,6 +60,7 @@ namespace Pistache
         private:
             void associateTransport(Transport* transport);
             Transport* transport() const;
+            static size_t getUniqueId();
 
             Transport* transport_ = nullptr;
             Fd fd_                = -1;

diff --git a/src/common/peer.cc b/src/common/peer.cc
@@ -19,9 +19,6 @@ namespace Pistache
 {
     namespace Tcp
     {
-
-        std::atomic<size_t> idCounter { 0 };
-
         namespace
         {
             struct ConcretePeer : Peer
@@ -37,7 +34,7 @@ namespace Pistache
             : fd_(fd)
             , addr(addr)
             , ssl_(ssl)
-            , id_(idCounter++)
+            , id_(getUniqueId())
         { }
 
         Peer::~Peer()
@@ -138,7 +135,7 @@ namespace Pistache
         std::ostream& operator<<(std::ostream& os, Peer& peer)
         {
             const auto& addr = peer.address();
-            os << "Peer with ID=" << peer.getID() << " (address=" << addr
+            os << "Peer " << &peer << " (id=" << peer.getID() << ", address=" << addr
                << ", hostname=" << peer.hostname() << ", fd=" << peer.fd() << ")";
             return os;
         }
@@ -153,5 +150,11 @@ namespace Pistache
             return transport_;
         }
 
+        size_t Peer::getUniqueId()
+        {
+            static std::atomic<size_t> idCounter { 0 };
+            return idCounter++;
+        }
+
     } // namespace Tcp
 } // namespace Pistache
diff --git a/tests/http_server_test.cc b/tests/http_server_test.cc
@@ -612,13 +612,13 @@ namespace
             }
             std::string requestAddress = request.address().host();
             writer.send(Http::Code::Ok, requestAddress);
-            std::cout << SERVER_PREFIX << " Sent: `" << requestAddress << "` data to "
+            std::cout << SERVER_PREFIX << " Sent `" << requestAddress << "` to "
                       << *peer << std::endl;
         }
 
         void onDisconnection(const std::shared_ptr<Tcp::Peer>& peer) override
         {
-            std::cout << SERVER_PREFIX << " Disconnect from peer " << *peer
+            std::cout << SERVER_PREFIX << " Disconnect from " << *peer
                       << std::endl;
             activeConnections.erase(peer->getID());
             waitHelper->increment();