Skip to content

Commit

Permalink
adding better debug logs for ClientProtocol
Browse files Browse the repository at this point in the history
  • Loading branch information
Kay Kurokawa committed Jan 25, 2017
1 parent 3263175 commit d560383
Showing 1 changed file with 11 additions and 10 deletions.
21 changes: 11 additions & 10 deletions lbrynet/core/client/ClientProtocol.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class ClientProtocol(Protocol):
######### Protocol #########

def connectionMade(self):
log.debug("Connection made to %s",str(self.factory.peer))
self._connection_manager = self.factory.connection_manager
self._rate_limiter = self.factory.rate_limiter
self.peer = self.factory.peer
Expand All @@ -43,13 +44,14 @@ def connectionMade(self):
self._ask_for_request()

def dataReceived(self, data):
log.debug("Data receieved from %s", str(self.peer))
self._rate_limiter.report_dl_bytes(len(data))
if self._downloading_blob is True:
self._blob_download_request.write(data)
else:
self._response_buff += data
if len(self._response_buff) > conf.settings['MAX_RESPONSE_INFO_SIZE']:
log.warning("Response is too large. Size %s", len(self._response_buff))
log.warning("Response is too large from %s. Size %s", str(self.peer), len(self._response_buff))
self.transport.loseConnection()
response, extra_data = self._get_valid_response(self._response_buff)
if response is not None:
Expand All @@ -59,6 +61,7 @@ def dataReceived(self, data):
self._blob_download_request.write(extra_data)

def connectionLost(self, reason):
log.debug("Connection lost to %s: %s", str(self.peer), reason)
self.connection_closed = True
if reason.check(error.ConnectionDone):
err = failure.Failure(ConnectionClosedBeforeResponseError())
Expand All @@ -78,7 +81,7 @@ def add_request(self, request):
raise ValueError("There is already a request for that response active")
self._next_request.update(request.request_dict)
d = defer.Deferred()
log.debug("Adding a request. Request: %s", str(request.request_dict))
log.debug("Adding a request for %s. Request: %s", str(self.peer), str(request.request_dict))
self._response_deferreds[request.response_identifier] = d
return d

Expand Down Expand Up @@ -116,9 +119,6 @@ def _handle_request_error(self, err):
self.transport.loseConnection()

def _ask_for_request(self):

log.debug("In _ask_for_request")

if self.connection_closed is True or self.connection_closing is True:
return

Expand Down Expand Up @@ -205,20 +205,20 @@ def get_next_request(results):
failed = True
if not isinstance(result.value, DownloadCanceledError):
log.info(result.value)
log.info("The connection is closing due to an error: %s",
result.getTraceback())
log.info("The connection to %s is closing due to an error: %s",
str(self.peer), result.getTraceback())
if failed is False:
log.debug("Asking for another request.")
log.debug("Asking for another request from %s", str(self.peer))
from twisted.internet import reactor
reactor.callLater(0, self._ask_for_request)
else:
log.debug("Not asking for another request.")
log.debug("Not asking for another request from %s", str(self.peer))
self.transport.loseConnection()

dl.addCallback(get_next_request)

def _downloading_finished(self, arg):
log.debug("The blob has finished downloading")
log.debug("The blob has finished downloading from %s", str(self.peer))
self._blob_download_request = None
self._downloading_blob = False
return arg
Expand Down Expand Up @@ -258,6 +258,7 @@ def __init__(self, peer, rate_limiter, connection_manager):
self.p = None

def clientConnectionFailed(self, connector, reason):
log.debug("Connection failed to %s: %s", str(self.peer), reason)
self.peer.report_down()
self.connection_manager.protocol_disconnected(self.peer, connector)

Expand Down

0 comments on commit d560383

Please sign in to comment.