fixed coroutine handling and stop catching general exception

LUCIT-Systems-and-Development · Mar 12, 2022 · 324f9fa · 324f9fa
1 parent a3d0545
commit 324f9fa
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,9 +7,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 [Discussions about unicorn-binance-websocket-api releases!](https://github.com/LUCIT-Systems-and-Development/unicorn-binance-websocket-api/discussions/categories/releases)
 
-## 1.40.2.dev (development stage/unreleased/unstable)
+## 1.40.3.dev (development stage/unreleased/unstable)
+
+## 1.40.3
+### Changed
+- Not catching general eception anymore - we must catch the specific exceptions
 ### Fixed
 - Catch KeyError before the general exception in sockets to give better feedback within the callback.
+- Error in coroutine loop handling
 
 ## 1.40.2
 ### Changed

diff --git a/example_process_streams.py b/example_process_streams.py
@@ -44,7 +44,7 @@
 
 class BinanceWebSocketApiProcessStreams(object):
     @staticmethod
-    def process_stream_data(received_stream_data_json, exchange="binance.com", stream_buffer_name="False"):
+    def process_stream_data(received_stream_data_json, stream_buffer_name="False"):
         #
         #  START HERE!
         #
@@ -58,6 +58,8 @@ def process_stream_data(received_stream_data_json, exchange="binance.com", strea
         # to see the difference.
         # Github: https://github.com/LUCIT-Systems-and-Development/unicorn-fy
         # PyPI: https://pypi.org/project/unicorn-fy/
+        exchange = "binance.com"
+
         if exchange == "binance.com" or exchange == "binance.com-testnet":
             unicorn_fied_stream_data = UnicornFy.binance_com_websocket(received_stream_data_json)
         elif exchange == "binance.com-futures" or exchange == "binance.com-futures-testnet":

diff --git a/sphinx/source/conf.py b/sphinx/source/conf.py
@@ -27,7 +27,7 @@
 # The short X.Y version
 version = ''
 # The full version, including alpha/beta/rc tags
-release = '1.40.2'
+release = '1.40.3'
 
 html_last_updated_fmt = "%b %d %Y at %H:%M (CET)"
 

diff --git a/unicorn_binance_websocket_api/manager.py b/unicorn_binance_websocket_api/manager.py
@@ -197,7 +197,7 @@ def __init__(self,
                  high_performance=False):
         threading.Thread.__init__(self)
         self.name = "unicorn-binance-websocket-api"
-        self.version = "1.40.2.dev"
+        self.version = "1.40.3.dev"
         logger.info(f"New instance of {self.get_user_agent()} on "
                     f"{str(platform.system())} {str(platform.release())} for exchange {exchange} started ...")
         if disable_colorama is not True:
@@ -520,7 +520,7 @@ def _create_stream_thread(self,
         asyncio.set_event_loop(loop)
         socket = BinanceWebSocketApiSocket(self, stream_id, channels, markets)
         try:
-            asyncio.ensure_future(socket.start_socket())
+            loop.create_task(socket.start_socket())
             loop.run_forever()
         except RuntimeError as error_msg:
             if "cannot schedule new futures after interpreter shutdown" in str(error_msg):

diff --git a/unicorn_binance_websocket_api/sockets.py b/unicorn_binance_websocket_api/sockets.py
@@ -217,13 +217,13 @@ async def start_socket(self):
                         logger.error("BinanceWebSocketApiSocket.start_socket(" + str(self.stream_id) + ", " +
                                      str(self.channels) + ", " + str(self.markets) + ") - KeyError (possibly within the"
                                      "callback function) - error_msg: " + str(error_msg))
-                    except Exception as error_msg:
-                        logger.error("BinanceWebSocketApiSocket.start_socket(" + str(self.stream_id) + ", " +
-                                     str(self.channels) + ", " + str(self.markets) + ") - Exception General Exception "
-                                     " (possibly within the callback function) - error_msg: " + str(error_msg))
-                        self.manager.stream_is_crashing(self.stream_id, str(error_msg))
-                        self.manager.set_restart_request(self.stream_id)
-                        sys.exit(1)
+#                    except Exception as error_msg:
+#                        logger.error("BinanceWebSocketApiSocket.start_socket(" + str(self.stream_id) + ", " +
+#                                     str(self.channels) + ", " + str(self.markets) + ") - Exception General Exception "
+#                                     " (possibly within the callback function) - error_msg: " + str(error_msg))
+#                        self.manager.stream_is_crashing(self.stream_id, str(error_msg))
+#                        self.manager.set_restart_request(self.stream_id)
+#                        sys.exit(1)
         except asyncio.TimeoutError as error_msg:
             # Catching https://github.com/LUCIT-Systems-and-Development/unicorn-binance-websocket-api/issues/221
             self.manager.stream_is_crashing(self.stream_id, error_msg)

diff --git a/unittest_binance_websocket_api.py b/unittest_binance_websocket_api.py
@@ -40,10 +40,9 @@
 import unittest
 import os
 import time
-#import tracemalloc
 
-
-#tracemalloc.start(25)
+# import tracemalloc
+# tracemalloc.start(25)
 
 BINANCE_COM_API_KEY = ""
 BINANCE_COM_API_SECRET = ""