From 881a3a00da796422cd60a2f42a3d61e405ee5172 Mon Sep 17 00:00:00 2001 From: Artem30801 Date: Thu, 23 Jan 2020 21:39:27 +0300 Subject: [PATCH] Tested and fixed filetransfer and request --- messaging_lib.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/messaging_lib.py b/messaging_lib.py index 00ff5b3..5f49ee9 100644 --- a/messaging_lib.py +++ b/messaging_lib.py @@ -385,15 +385,16 @@ class ConnectionManager(object): args = message.content["args"] kwargs = message.content["kwargs"] - callback = self.requests_callbacks.get(requested_value, None) - if callback is None: - logger.warning("Request {} does not exist!".format(requested_value)) - return filetransfer = requested_value == "filetransfer" try: if filetransfer: value = self._read_file(kwargs["filepath"]) else: + callback = self.requests_callbacks.get(requested_value, None) + if callback is None: + logger.warning("Request {} does not exist!".format(requested_value)) + return + value = callback(self, *args, **kwargs) except Exception as error: # TODO send response error\cancel logger.error("Error during request {} processing: {}".format(requested_value, error)) @@ -412,12 +413,14 @@ class ConnectionManager(object): if requested_value == "filetransfer": value = True self._process_filetransfer(message.content, request.callback_kwargs["filepath"]) + logger.debug( + "Request {} successfully closed with file bytes {}...".format(request, message.content[:256]) + ) else: value = message.content["value"] - - logger.debug( - "Request {} successfully closed with value {}".format(request, message.content["value"]) - ) + logger.debug( + "Request {} successfully closed with value {}".format(request, message.content["value"]) + ) if request.callback is not None: try: request.callback(self, value, *request.callback_args, **request.callback_kwargs)