masscollaborationlabs/p2pfs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make __message_log method protected to be used by subclassees.

Browse source
This commit is contained in:
Yuxin Wang 2018-10-06 22:51:24 -04:00
parent 4853c73e53
commit c4dbe9c5cc
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
p2pfs/core/server.py
View file

@ -52,7 +52,7 @@ class MessageServer:
await writer.wait_close()
@staticmethod
def __message_log(message):
def _message_log(message):
log_message = {key: message[key] for key in message if key != 'data'}
log_message['type'] = MessageType(message['type']).name
return log_message
@ -64,12 +64,12 @@ class MessageServer:
msglen = struct.unpack('>I', raw_msg_len)[0]
raw_msg = await reader.readexactly(msglen)
msg = json.loads(self._decompressor.decompress(raw_msg).decode('utf-8'))
logger.debug('Message received {}'.format(self.__message_log(msg)))
logger.debug('Message received {}'.format(self._message_log(msg)))
return msg
async def _write_message(self, writer, message):
assert isinstance(writer, asyncio.StreamWriter)
logger.debug('Writing {}'.format(self.__message_log(message)))
logger.debug('Writing {}'.format(self._message_log(message)))
# use value of enum since Enum is not JSON serializable
message['type'] = message['type'].value
# json string (str) -> encode to utf8 (bytes) -> compress (bytes) -> add length header (bytes)