LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

better more logging on the server side

Browse source
This commit is contained in:
Job Evers-Meltzer 2016-08-11 05:25:45 +00:00
parent 623fda3087
commit c7430f4ae9
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lbrynet/reflector/server/server.py
View file

@ -30,17 +30,20 @@ class ReflectorServer(Protocol):
pass pass
def dataReceived(self, data): def dataReceived(self, data):
if self.receiving_blob is False: if self.receiving_blob:
log.debug('Writing data to blob')
self.blob_write(data)
else:
log.debug('Not yet recieving blob, data needs further processing')
self.request_buff += data self.request_buff += data
msg, extra_data = self._get_valid_response(self.request_buff) msg, extra_data = self._get_valid_response(self.request_buff)
if msg is not None: if msg is not None:
self.request_buff = '' self.request_buff = ''
d = self.handle_request(msg) d = self.handle_request(msg)
d.addCallbacks(self.send_response, self.handle_error) d.addCallbacks(self.send_response, self.handle_error)
if self.receiving_blob is True and len(extra_data) != 0: if self.receiving_blob and extra_data:
log.debug('Writing extra data to blog')
self.blob_write(extra_data) self.blob_write(extra_data)
else:
self.blob_write(data)
def _get_valid_response(self, response_msg): def _get_valid_response(self, response_msg):
extra_data = None extra_data = None
@ -71,6 +74,7 @@ class ReflectorServer(Protocol):
return self.handle_normal_request(request_dict) return self.handle_normal_request(request_dict)
def handle_handshake(self, request_dict): def handle_handshake(self, request_dict):
log.debug('Handling handshake')
if 'version' not in request_dict: if 'version' not in request_dict:
raise ValueError("Client should send version") raise ValueError("Client should send version")
self.peer_version = int(request_dict['version']) self.peer_version = int(request_dict['version'])
@ -104,6 +108,7 @@ class ReflectorServer(Protocol):
raise ValueError("Expected a blob hash and a blob size") raise ValueError("Expected a blob hash and a blob size")
if not is_valid_blobhash(request_dict['blob_hash']): if not is_valid_blobhash(request_dict['blob_hash']):
raise ValueError("Got a bad blob hash: {}".format(request_dict['blob_hash'])) raise ValueError("Got a bad blob hash: {}".format(request_dict['blob_hash']))
log.debug('Recieved info for blob: %s', request_dict['blob_hash'])
d = self.blob_manager.get_blob( d = self.blob_manager.get_blob(
request_dict['blob_hash'], request_dict['blob_hash'],
True, True,
@ -115,6 +120,7 @@ class ReflectorServer(Protocol):
# important in it. to the deferred that fires when the blob is done, # important in it. to the deferred that fires when the blob is done,
# add a callback which returns a nice response dict saying to keep # add a callback which returns a nice response dict saying to keep
# sending, and then return that deferred # sending, and then return that deferred
log.debug('blob is already open')
self.receiving_blob = True self.receiving_blob = True
d = self.blob_finished_d d = self.blob_finished_d
d.addCallback(lambda _: self.close_blob()) d.addCallback(lambda _: self.close_blob())
@ -135,3 +141,7 @@ class ReflectorServerFactory(ServerFactory):
def __init__(self, peer_manager, blob_manager): def __init__(self, peer_manager, blob_manager):
self.peer_manager = peer_manager self.peer_manager = peer_manager
self.blob_manager = blob_manager self.blob_manager = blob_manager
def buildProtocol(self, addr):
log.debug('Creating a protocol for %s', addr)
return ServerFactory.buildProtocol(self, addr)