From c1a30d3f54790214f63657601c62f02f44d22e67 Mon Sep 17 00:00:00 2001 From: Gregor Robinson Date: Thu, 20 Jun 2013 22:54:08 -0600 Subject: [PATCH] Fix typos introduced by 6d11e5a. --- src/bitmessagemain.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/bitmessagemain.py b/src/bitmessagemain.py index 6daa385f..62809837 100755 --- a/src/bitmessagemain.py +++ b/src/bitmessagemain.py @@ -457,7 +457,7 @@ class receiveDataThread(threading.Thread): if len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) > 0: logger.debug('(concerning %s) number of objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave is now %s', self.HOST, - self.len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave)) + len(self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave)) numberOfObjectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHavePerPeer[self.HOST] = len( self.objectsThatWeHaveYetToCheckAndSeeWhetherWeAlreadyHave) # this data structure is maintained so that we can keep track of how many total objects, across all connections, are currently outstanding. If it goes too high it can indicate that we are under attack by multiple nodes working together. if len(self.ackDataThatWeHaveYetToSend) > 0: @@ -752,7 +752,7 @@ class receiveDataThread(threading.Thread): fromAddress = encodeAddress( sendersAddressVersion, sendersStream, ripe.digest()) - logger.info('fromAddress: %s' str(fromAddress)) + logger.info('fromAddress: %s', str(fromAddress)) if messageEncodingType == 2: bodyPositionIndex = string.find(message, '\nBody:') if bodyPositionIndex > 1: @@ -813,11 +813,13 @@ class receiveDataThread(threading.Thread): # their key rather than some other key. toRipe = key initialDecryptionSuccessful = True - logger.info('EC decryption successful using key associated with ripe hash:', + logger.info('EC decryption successful using key associated with ripe hash: %s', key.encode('hex')) break except Exception as err: - logger.exception('cryptorObject.decrypt Exception: %s' % str(err)) + # TODO(grobinson): Avoid using exceptions for normal + # application logic. + pass if not initialDecryptionSuccessful: # This is not a broadcast I am interested in. logger.info('Time spent failing to decrypt this v2 broadcast: %s seconds.',