Bitmessage/PyBitmessage-2025-01-22
Archived
2
0
Fork 0
Code Issues 167 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Merge remote-tracking branch 'xj9/master'

Browse Source 
Conflicts:
	src/bitmessagemain.py
This commit is contained in:
Gregor Robinson 2013-06-20 14:31:00 -06:00
commit 3cfbc23680
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bitmessagemain.py
View File

@ -1068,7 +1068,7 @@ class receiveDataThread(threading.Thread):
return return
else: else:
logger.info('This was NOT on acknowledgement bound for me.') logger.info('This was NOT on acknowledgement bound for me.')
# logger.info("Ack data for which I'm watching: %s" % ackdataForWhichImWatching) logger.debug("Ack data for which I'm watching: %s" % ackdataForWhichImWatching)
# This is not an acknowledgement bound for me. See if it is a message # This is not an acknowledgement bound for me. See if it is a message
# bound for me by trying to decrypt it with my private keys. # bound for me by trying to decrypt it with my private keys.
@ -1078,11 +1078,11 @@ class receiveDataThread(threading.Thread):
encryptedData[readPosition:]) encryptedData[readPosition:])
toRipe = key # This is the RIPE hash of my pubkeys. We need this below to compare to the destination_ripe included in the encrypted data. toRipe = key # This is the RIPE hash of my pubkeys. We need this below to compare to the destination_ripe included in the encrypted data.
initialDecryptionSuccessful = True initialDecryptionSuccessful = True
print 'EC decryption successful using key associated with ripe hash:', key.encode('hex') logger.info('EC decryption successful using key associated with ripe hash: %s' % str(key.encode('hex')))
break break
except Exception as err: except Exception as err:
pass pass
# print 'cryptorObject.decrypt Exception:', err logger.debug('cryptorObject.decrypt Exception: %s' % str(err))
if not initialDecryptionSuccessful: if not initialDecryptionSuccessful:
# This is not a message bound for me. # This is not a message bound for me.
logger.info('Length of time program spent failing to decrypt this message %s seconds' % logger.info('Length of time program spent failing to decrypt this message %s seconds' %

3
src/debug.py
View File

@ -3,7 +3,8 @@
import logging import logging
import logging.config import logging.config
log_level = 'DEBUG' # Get from a config file at some point? # TODO(xj9): Get from a config file at some point?
log_level = 'DEBUG'
logging.config.dictConfig({ logging.config.dictConfig({
'version': 1, 'version': 1,