Browse Source

Add remote version to p2pconnected log event

cl-refactor
Lefteris Karapetsas 10 years ago
parent
commit
6c4faef732
  1. 4
      libdevcore/StructuredLogger.cpp
  2. 4
      libdevcore/StructuredLogger.h
  3. 1
      libp2p/Host.cpp

4
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, 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) if (m_enabled)
{ {
std::stringstream addrStream; std::stringstream addrStream;
addrStream << _addr; addrStream << _addr;
Json::Value event; 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["comment"] = "as soon as a successful connection to another node is established";
event["remote_addr"] = addrStream.str(); event["remote_addr"] = addrStream.str();
event["remote_id"] = _id; event["remote_id"] = _id;

4
libdevcore/StructuredLogger.h

@ -19,6 +19,8 @@
* @date 2015 * @date 2015
* *
* A simple helper class for the structured logging * 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 #pragma once
@ -40,7 +42,7 @@ public:
void logStarting(std::string const& _clientImpl, const char* _ethVersion); void logStarting(std::string const& _clientImpl, const char* _ethVersion);
void logP2PConnected(std::string const& _id, bi::tcp::endpoint const& _addr, 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 logP2PDisconnected(std::string const& _id, bi::tcp::endpoint const& _addr, unsigned int _numConnections) const;
void logMinedNewBlock(std::string const& _hash, std::string const& _blockNumber, 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;

1
libp2p/Host.cpp

@ -162,6 +162,7 @@ void Host::registerPeer(std::shared_ptr<Session> _s, CapDescs const& _caps)
m_structuredLogger.logP2PConnected( m_structuredLogger.logP2PConnected(
_s->m_peer->id.abridged(), _s->m_peer->peerEndpoint(), _s->m_peer->id.abridged(), _s->m_peer->peerEndpoint(),
_s->m_peer->m_lastConnected, _s->m_peer->m_lastConnected,
_s->m_info.clientVersion,
0);// TODO: num_connections 0);// TODO: num_connections
RecursiveGuard l(x_sessions); RecursiveGuard l(x_sessions);
// TODO: temporary loose-coupling; if m_peers already has peer, // TODO: temporary loose-coupling; if m_peers already has peer,

Loading…
Cancel
Save