Merge pull request #37 from emestee/master

503 during socket handshake causes infinite loop #36

Author: slazarov

bittrex_websocket/_auxiliary.py

@@ -27,6 +27,8 @@ def find_ticker_type(tickers):
 
 
 class Ticker(object):
+    ORDERBOOK_DEPTH_TIMEOUT = 40
+    
     def __init__(self):
         self.list = {}
         self.sub_types = [SUB_TYPE_ORDERBOOK,
@@ -143,10 +145,12 @@ def set_book_depth(self, tickers, book_depth):
         tickers_list = find_ticker_type(tickers)
         for ticker in tickers_list:
             timeout = 0
-            while timeout < 40:
+            while timeout < self.ORDERBOOK_DEPTH_TIMEOUT:
                 while ticker not in self.list:
                     sleep(0.5)
                     timeout += 0.5
+                    if timeout > self.ORDERBOOK_DEPTH_TIMEOUT:
+                        raise RuntimeError("Unable to set order book depth, timeout")
                 else:
                     self.list[ticker][SUB_TYPE_ORDERBOOK]['OrderBookDepth'] = book_depth
                     logger.info(

bittrex_websocket/websocket_client.py

@@ -218,7 +218,7 @@ def _start_main_thread(self):
         initialization with further subthreads for each connection.
         """
         self.on_open()
-        thread = Thread(target=self._start_socket_control_queue)
+        thread = Thread(target=self._start_socket_control_queue, name='BittrexSocketControlQueue')
         thread.daemon = True
         self.threads[thread.getName()] = thread
         thread.start()
@@ -269,7 +269,7 @@ def _handle_connect(self, conn_event):
         :param conn_event: Contains the connection object.
         :type conn_event: ConnectEvent
         """
-        thread = Thread(target=self._init_connection, args=(conn_event.conn_obj,))
+        thread = Thread(target=self._init_connection, args=(conn_event.conn_obj,), name='BittrexConnectionSetup')
         self.threads[thread.getName()] = thread
         conn_event.conn_obj.assign_thread(thread.getName())
         self.connections.update({conn_event.conn_obj.id: conn_event.conn_obj})
@@ -602,7 +602,7 @@ def _get_snapshot(self, tickers):
     def _is_order_queue(self):
         if self.order_queue is None:
             self.order_queue = queue.Queue()
-            thread = Thread(target=self._start_order_queue)
+            thread = Thread(target=self._start_order_queue, name='BittrexOrderQueueProcessor')
             thread.daemon = True
             self.threads[thread.getName()] = thread
             thread.start()