Change log level to debug for some subscription client lines (#1018)

* Change log level to debug for some subscription client lines

* Remove more log lines

* Fix get squeak locator when follow list is empty

* Handle poison pills more cleanly in subscription clients

squeaknode/network/connected_peers_subscription_client.py

@@ -36,15 +36,15 @@ class ConnectedPeersSubscriptionClient:
                 name=callback_name,
                 callback=self.enqueue_connected_peers,
             )
-            logger.info("Before yielding connected peers client...")
+            logger.debug("Before yielding connected peers client...")
             yield self
-            logger.info("After yielding connected peers client...")
+            logger.debug("After yielding connected peers client...")
         finally:
-            logger.info("Stopping connected peers client...")
+            logger.debug("Stopping connected peers client...")
             self.connection_manager.remove_peers_changed_callback(
                 name=callback_name,
             )
-            logger.info("Stopped connected peers client...")
+            logger.debug("Stopped connected peers client...")
 
     def enqueue_connected_peers(self, connected_peers):
         self.q.put(connected_peers)
@@ -57,10 +57,11 @@ class ConnectedPeersSubscriptionClient:
         while True:
             item = self.q.get()
             if item is None:
-                raise Exception("Poison pill swallowed.")
+                logger.debug("Poison pill swallowed.")
+                return
             yield item
             self.q.task_done()
-            logger.info(
+            logger.debug(
                 "Removed item from queue. Size: {}".format(
                     self.q.qsize())
             )

squeaknode/network/peer.py

@@ -166,7 +166,6 @@ class Peer(object):
         This method blocks when the socket has no data to read.
         """
         msg = self._recv_msg_queue.get()
-        logger.debug('Received msg {} from {}'.format(msg, self))
         logger.info('Received msg {} from {}'.format(msg, self))
         return msg
 
@@ -179,7 +178,6 @@ class Peer(object):
             pass
 
     def send_msg(self, msg):
-        logger.debug('Sending msg {} to {}'.format(msg, self))
         logger.info('Sending msg {} to {}'.format(msg, self))
         data = msg.to_bytes()
         try:
@@ -250,7 +248,6 @@ class Peer(object):
         peer_message_handler = PeerMessageHandler(
             self, squeak_controller)
         peer_message_handler.handle_msgs()
-        logger.info('Finished handling messages...')
 
     @contextmanager
     def open_connection(self, squeak_controller):
@@ -360,7 +357,7 @@ class HandshakeTimer:
         self.timer.start()
 
     def stop_timer(self):
-        logger.info("Canceling handshake timer.")
+        logger.debug("Canceling handshake timer.")
         self.timer.cancel()
 
     def stop_peer(self):

squeaknode/network/peer_message_handler.py

@@ -35,12 +35,10 @@ class PeerMessageHandler:
 
         This method blocks when the peer has not sent any messages.
         """
-        logger.info('Started handling connected messages...')
         msg = self.peer.recv_msg()
         while msg is not None:
             self.handle_peer_message(msg)
             msg = self.peer.recv_msg()
-        logger.info('Finished handling connected messages...')
 
     def handle_peer_message(self, msg):
         """Handle messages from a peer with completed handshake."""
@@ -171,7 +169,6 @@ class PeerMessageHandler:
             self.squeak_controller.save_offer(decoded_offer)
 
     def handle_subscribe(self, msg):
-        logger.info("Received subscribe msg: {}".format(msg))
         self._send_reply_invs(msg.locator)
         self.peer.set_subscription(msg)
 

squeaknode/node/new_squeak_listener.py

@@ -16,9 +16,6 @@ class NewSqueakListener:
         self.callbacks = {}
 
     def handle_new_squeak(self, squeak):
-        # logger.info("Handling new squeak: {!r}".format(
-        #     get_hash(squeak).hex(),
-        # ))
         for callback in self.callbacks.values():
             callback(squeak)
 
@@ -53,15 +50,15 @@ class NewSqueakSubscriptionClient:
                 name=callback_name,
                 callback=self.enqueue_squeak,
             )
-            logger.info("Before yielding new squeaks client...")
+            logger.debug("Before yielding new squeaks client...")
             yield self
-            logger.info("After yielding new squeaks client...")
+            logger.debug("After yielding new squeaks client...")
         finally:
-            logger.info("Stopping new squeaks client...")
+            logger.debug("Stopping new squeaks client...")
             self.new_squeak_listener.remove_callback(
                 name=callback_name,
             )
-            logger.info("Stopped new squeaks client...")
+            logger.debug("Stopped new squeaks client...")
 
     def enqueue_squeak(self, squeak):
         self.q.put(squeak)
@@ -78,7 +75,7 @@ class NewSqueakSubscriptionClient:
                 return
             yield item
             self.q.task_done()
-            logger.info(
+            logger.debug(
                 "Removed item from queue. Size: {}".format(
                     self.q.qsize())
             )

squeaknode/node/received_payments_subscription_client.py

@@ -69,7 +69,8 @@ class ReceivedPaymentsSubscriptionClient:
         while True:
             payment = self.q.get()
             if payment is None:
-                raise Exception("Poison pill swallowed.")
+                logger.debug("Poison pill swallowed.")
+                return
             yield payment
             self.q.task_done()
             logger.info(

squeaknode/node/squeak_controller.py

@@ -526,6 +526,10 @@ class SqueakController:
     def get_interested_locator(self):
         block_range = self.get_block_range()
         followed_addresses = self.get_followed_addresses()
+        if len(followed_addresses) == 0:
+            return CSqueakLocator(
+                vInterested=[],
+            )
         interests = [
             CInterested(
                 addresses=[CSqueakAddress(address)