citizenaspirant/PyBitmessage
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Improved logger function calls and import shared here instead of debug

Browse Source
This commit is contained in:
Jordan Hall 2013-08-09 23:26:16 +01:00
parent 13196233a9
commit a69a00d186
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/bitmessagemain.py
View File

@ -34,8 +34,7 @@ from class_addressGenerator import *
# Helper Functions # Helper Functions
import helper_bootstrap import helper_bootstrap
# Debug logger import shared
from debug import logger
import sys import sys
if sys.platform == 'darwin': if sys.platform == 'darwin':
@ -517,7 +516,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
status, addressVersionNumber, streamNumber, toRipe = decodeAddress( status, addressVersionNumber, streamNumber, toRipe = decodeAddress(
toAddress) toAddress)
if status != 'success': if status != 'success':
logger.warn('API Error 0007: Could not decode address: %s', toAddress + ' : ' + status) logger.warn('API Error 0007: Could not decode address: %s:%s.', toAddress, status)
if status == 'checksumfailed': if status == 'checksumfailed':
return 'API Error 0008: Checksum failed for address: ' + toAddress return 'API Error 0008: Checksum failed for address: ' + toAddress
@ -533,7 +532,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
status, addressVersionNumber, streamNumber, fromRipe = decodeAddress( status, addressVersionNumber, streamNumber, fromRipe = decodeAddress(
fromAddress) fromAddress)
if status != 'success': if status != 'success':
logger.warn('API Error 0007: Could not decode address: %s', fromAddress + ' : ' + status) logger.warn('API Error 0007: Could not decode address: %s:%s.', fromAddress, status)
if status == 'checksumfailed': if status == 'checksumfailed':
return 'API Error 0008: Checksum failed for address: ' + fromAddress return 'API Error 0008: Checksum failed for address: ' + fromAddress
@ -597,7 +596,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
status, addressVersionNumber, streamNumber, fromRipe = decodeAddress( status, addressVersionNumber, streamNumber, fromRipe = decodeAddress(
fromAddress) fromAddress)
if status != 'success': if status != 'success':
logger.warn('API Error 0007: Could not decode address: %s', fromAddress + ' : ' + status) logger.warn('API Error 0007: Could not decode address: %s:%s.', fromAddress, status)
if status == 'checksumfailed': if status == 'checksumfailed':
return 'API Error 0008: Checksum failed for address: ' + fromAddress return 'API Error 0008: Checksum failed for address: ' + fromAddress
@ -667,7 +666,7 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
status, addressVersionNumber, streamNumber, toRipe = decodeAddress( status, addressVersionNumber, streamNumber, toRipe = decodeAddress(
address) address)
if status != 'success': if status != 'success':
logger.warn('API Error 0007: Could not decode address: %s', address + ' : ' + status) logger.warn('API Error 0007: Could not decode address: %s:%s.', address, status)
if status == 'checksumfailed': if status == 'checksumfailed':
return 'API Error 0008: Checksum failed for address: ' + address return 'API Error 0008: Checksum failed for address: ' + address