From 693fef1964e281eaf7b39f9bd9f5728406942a14 Mon Sep 17 00:00:00 2001
From: Job Evers-Meltzer <jobevers@users.noreply.github.com>
Date: Thu, 3 Nov 2016 10:43:24 -0500
Subject: [PATCH] remove reactor.iterate from dht shutdown

---
 lbrynet/dht/protocol.py | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/lbrynet/dht/protocol.py b/lbrynet/dht/protocol.py
index a3b5936cf..8eae3bc0e 100644
--- a/lbrynet/dht/protocol.py
+++ b/lbrynet/dht/protocol.py
@@ -21,6 +21,7 @@ import msgtypes
 import msgformat
 from contact import Contact
 
+
 reactor = twisted.internet.reactor
 log = logging.getLogger(__name__)
 
@@ -124,10 +125,10 @@ class KademliaProtocol(protocol.DatagramProtocol):
         except IndexError:
             log.warning("Couldn't decode dht datagram from %s", address)
             return
-        
+
         message = self._translator.fromPrimitive(msgPrimitive)
         remoteContact = Contact(message.nodeID, address[0], address[1], self)
-        
+
         # Refresh the remote node's details in the local node's k-buckets
         self._node.addContact(remoteContact)
 
@@ -143,7 +144,9 @@ class KademliaProtocol(protocol.DatagramProtocol):
                 del self._sentMessages[message.id]
 
                 if hasattr(df, '_rpcRawResponse'):
-                    # The RPC requested that the raw response message and originating address be returned; do not interpret it
+                    # The RPC requested that the raw response message
+                    # and originating address be returned; do not
+                    # interpret it
                     df.callback((message, address))
                 elif isinstance(message, msgtypes.ErrorMessage):
                     # The RPC request raised a remote exception; raise it locally
@@ -175,7 +178,7 @@ class KademliaProtocol(protocol.DatagramProtocol):
     def _send(self, data, rpcID, address):
         """ Transmit the specified data over UDP, breaking it up into several
         packets if necessary
-        
+
         If the data is spread over multiple UDP datagrams, the packets have the
         following structure::
             |           |     |      |      |        ||||||||||||   0x00   |
@@ -183,7 +186,7 @@ class KademliaProtocol(protocol.DatagramProtocol):
             | type ID   | of packets |of this packet |          | indicator|
             | (1 byte)  | (2 bytes)  |  (2 bytes)    |(20 bytes)| (1 byte) |
             |           |     |      |      |        ||||||||||||          |
-        
+
         @note: The header used for breaking up large data segments will
                possibly be moved out of the KademliaProtocol class in the
                future, into something similar to a message translator/encoder
@@ -301,19 +304,19 @@ class KademliaProtocol(protocol.DatagramProtocol):
             df.errback(failure.Failure(TimeoutError(remoteContactID)))
         else:
             # This should never be reached
-            print "ERROR: deferred timed out, but is not present in sent messages list!"
+            log.error("deferred timed out, but is not present in sent messages list!")
 
     def stopProtocol(self):
         """ Called when the transport is disconnected.
-        
+
         Will only be called once, after all ports are disconnected.
         """
+        log.info('Stopping dht')
         for key in self._callLaterList.keys():
             try:
                 if key > time.time():
+                    log.info('Cancelling %s', self._callLaterList[key])
                     self._callLaterList[key].cancel()
             except Exception, e:
-                print e
+                log.exception('Failed to cancel %s', self._callLaterList[key])
             del self._callLaterList[key]
-            #TODO: test: do we really need the reactor.iterate() call?
-            reactor.iterate()