Merge remote-tracking branch 'xj9/master'

Conflicts:
	src/bitmessagemain.py

src/bitmessagemain.py

@@ -1068,7 +1068,7 @@ class receiveDataThread(threading.Thread):
             return
         else:
             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
         # bound for me by trying to decrypt it with my private keys.
@@ -1078,11 +1078,11 @@ class receiveDataThread(threading.Thread):
                     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.
                 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
             except Exception as err:
                 pass
-                # print 'cryptorObject.decrypt Exception:', err
+                logger.debug('cryptorObject.decrypt Exception: %s' % str(err))
         if not initialDecryptionSuccessful:
             # This is not a message bound for me.
             logger.info('Length of time program spent failing to decrypt this message %s seconds' %

src/debug.py

@@ -3,7 +3,8 @@
 import logging
 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({
     'version': 1,