Skip to content
This repository has been archived by the owner on Oct 31, 2023. It is now read-only.

More debugs during P2P session startup #5129

Merged
merged 1 commit into from
Mar 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions golem/network/p2p/peersession.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,13 @@ def send(self, msg, send_unverified=False):
the connection hasn't been
verified yet?
"""
logger.debug(
'%s.%s.send(send_unverified=%r, msg=%r)',
self.__class__.__module__,
self.__class__.__qualname__,
send_unverified,
msg,
)
BasicSafeSession.send(self, msg, send_unverified)
self.p2p_service.set_last_message(
"->",
Expand Down Expand Up @@ -160,6 +167,11 @@ def start(self):
self.port
)
if self.__should_init_handshake():
logger.debug(
'Initiating handshake with %s:%r',
self.address,
self.port,
)
self.__send_hello()

def ping(self, interval):
Expand Down
6 changes: 6 additions & 0 deletions golem/network/transport/network.py
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,12 @@ def from_factory(cls, factory: 'ProtocolFactory') -> 'ProtocolFactory':
)

def buildProtocol(self, addr):
logger.debug(
'buildProtocol(%r) session_factory=%s, server=%s',
addr,
self.session_factory,
self.server,
)
return self.protocol_class(self.session_factory, server=self.server)


Expand Down
17 changes: 17 additions & 0 deletions golem/network/transport/tcpnetwork.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,18 @@ def opened(self):
def dataReceived(self, data):
"""Called when additional chunk of data
is received from another peer"""
logger.debug(
'%s.%s.dataReceived(%r)',
self.__class__.__module__,
self.__class__.__qualname__,
data,
)
if not self._can_receive():
logger.debug(
"Can't receive. opened:%s self.db:%r",
self.opened,
self.db,
)
return

if not self.session:
Expand Down Expand Up @@ -529,6 +540,12 @@ def sendHandshake(self) -> bool:
return True

def dataReceived(self, data: bytes) -> None:
logger.debug(
'%s.%s.dataReceived(%r)',
self.__class__.__module__,
self.__class__.__qualname__,
data,
)
if self.is_connected(): # pylint: disable=no-member
return super().dataReceived(data)
if self.is_handshaking(): # pylint: disable=no-member
Expand Down