From 6c4faef7327ecc2488f9ce329f406db7f9867f4d Mon Sep 17 00:00:00 2001 From: Lefteris Karapetsas Date: Sun, 1 Mar 2015 00:20:09 +0100 Subject: [PATCH] Add remote version to p2pconnected log event --- libdevcore/StructuredLogger.cpp | 4 ++-- libdevcore/StructuredLogger.h | 10 ++++++---- libp2p/Host.cpp | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libdevcore/StructuredLogger.cpp b/libdevcore/StructuredLogger.cpp index 8188b0d04..1114755ec 100644 --- a/libdevcore/StructuredLogger.cpp +++ b/libdevcore/StructuredLogger.cpp @@ -62,14 +62,14 @@ void StructuredLogger::logStarting(string const& _clientImpl, const char* _ethVe } void StructuredLogger::logP2PConnected(string const& _id, bi::tcp::endpoint const& _addr, - chrono::system_clock::time_point const& _ts, unsigned int _numConnections) const + chrono::system_clock::time_point const& _ts, string const& _remoteVersion, unsigned int _numConnections) const { if (m_enabled) { std::stringstream addrStream; addrStream << _addr; Json::Value event; - event["remote_version_string"] = ""; //TODO + event["remote_version_string"] = _remoteVersion; event["comment"] = "as soon as a successful connection to another node is established"; event["remote_addr"] = addrStream.str(); event["remote_id"] = _id; diff --git a/libdevcore/StructuredLogger.h b/libdevcore/StructuredLogger.h index b3a71430f..739aef274 100644 --- a/libdevcore/StructuredLogger.h +++ b/libdevcore/StructuredLogger.h @@ -19,6 +19,8 @@ * @date 2015 * * A simple helper class for the structured logging + * The spec for the implemented log events is here: + * https://github.com/ethereum/system-testing/wiki/Log-Events */ #pragma once @@ -40,14 +42,14 @@ public: void logStarting(std::string const& _clientImpl, const char* _ethVersion); void logP2PConnected(std::string const& _id, bi::tcp::endpoint const& _addr, - std::chrono::system_clock::time_point const& _ts, unsigned int _numConnections) const; + std::chrono::system_clock::time_point const& _ts, std::string const& _remoteVersion, unsigned int _numConnections) const; void logP2PDisconnected(std::string const& _id, bi::tcp::endpoint const& _addr, unsigned int _numConnections) const; void logMinedNewBlock(std::string const& _hash, std::string const& _blockNumber, - std::string const& _chainHeadHash, std::string const& _prevHash) const; + std::string const& _chainHeadHash, std::string const& _prevHash) const; void logChainReceivedNewBlock(std::string const& _hash, std::string const& _blockNumber, std::string const& _chainHeadHash, - std::string const& _remoteID, std::string const& _prevHash) const; + std::string const& _remoteID, std::string const& _prevHash) const; void logChainNewHead(std::string const& _hash, std::string const& _blockNumber, std::string const& _chainHeadHash, - std::string const& _prevHash) const; + std::string const& _prevHash) const; void logTransactionReceived(std::string const& _hash, std::string const& _remoteId) const; private: /// @returns a string representation of a timepoint diff --git a/libp2p/Host.cpp b/libp2p/Host.cpp index 5b35f4ca7..ffc726db8 100644 --- a/libp2p/Host.cpp +++ b/libp2p/Host.cpp @@ -162,6 +162,7 @@ void Host::registerPeer(std::shared_ptr _s, CapDescs const& _caps) m_structuredLogger.logP2PConnected( _s->m_peer->id.abridged(), _s->m_peer->peerEndpoint(), _s->m_peer->m_lastConnected, + _s->m_info.clientVersion, 0);// TODO: num_connections RecursiveGuard l(x_sessions); // TODO: temporary loose-coupling; if m_peers already has peer,