Skip to content

replaced all the print statement of api.py module with logger #1673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
navjotcis wants to merge 1 commit into from
Closed

replaced all the print statement of api.py module with logger #1673

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions src/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,27 +1208,31 @@ def HandleDisseminatePreEncryptedMsg(self, params):
) * requiredAverageProofOfWorkNonceTrialsPerByte
)
with threads.printLock:
print(
logger.warning(
'(For msg message via API) Doing proof of work.'
'Total required difficulty:',
'Total required difficulty: %f'
'Required small message difficulty: %f',
float(
requiredAverageProofOfWorkNonceTrialsPerByte
) / defaults.networkDefaultProofOfWorkNonceTrialsPerByte,
'Required small message difficulty:',
float(
requiredPayloadLengthExtraBytes
) / defaults.networkDefaultPayloadLengthExtraBytes,
) / defaults.networkDefaultPayloadLengthExtraBytes
)
powStartTime = time.time()
initialHash = hashlib.sha512(encryptedPayload).digest()
trialValue, nonce = proofofwork.run(target, initialHash)
with threads.printLock:
print '(For msg message via API) Found proof of work', trialValue, 'Nonce:', nonce
logger.info(
"(For msg message via API) Found proof of work %s Nonce: %s",
trialValue, nonce
)
try:
print(
'POW took', int(time.time() - powStartTime),
'seconds.', nonce / (time.time() - powStartTime),
logger.warning(
'POW took %d seconds. %f'
'nonce trials per second.',
int(time.time() - powStartTime),
nonce / (time.time() - powStartTime)
)
except BaseException:
pass
Expand All @@ -1242,7 +1246,10 @@ def HandleDisseminatePreEncryptedMsg(self, params):
int(time.time()) + TTL, ''
)
with threads.printLock:
print 'Broadcasting inv for msg(API disseminatePreEncryptedMsg command):', hexlify(inventoryHash)
logger.warning(
'Broadcasting inv for msg(API disseminatePreEncryptedMsg command): %s',
hexlify(inventoryHash)
)
queues.invQueue.put((toStreamNumber, inventoryHash))

def HandleTrashSentMessageByAckDAta(self, params):
Expand Down Expand Up @@ -1272,10 +1279,13 @@ def HandleDissimatePubKey(self, params):
target = 2 ** 64 / ((
len(payload) + defaults.networkDefaultPayloadLengthExtraBytes + 8
) * defaults.networkDefaultProofOfWorkNonceTrialsPerByte)
print '(For pubkey message via API) Doing proof of work...'
logger.debug('(For pubkey message via API) Doing proof of work...')
initialHash = hashlib.sha512(payload).digest()
trialValue, nonce = proofofwork.run(target, initialHash)
print '(For pubkey message via API) Found proof of work', trialValue, 'Nonce:', nonce
logger.debug(
'(For pubkey message via API) Found proof of work %s Nonce: %s',
trialValue, nonce
)
payload = pack('>Q', nonce) + payload

pubkeyReadPosition = 8 # bypass the nonce
Expand All @@ -1296,7 +1306,10 @@ def HandleDissimatePubKey(self, params):
objectType, pubkeyStreamNumber, payload, int(time.time()) + TTL, ''
)
with threads.printLock:
print 'broadcasting inv within API command disseminatePubkey with hash:', hexlify(inventoryHash)
logger.warning(
'broadcasting inv within API command disseminatePubkey with hash: %s',
hexlify(inventoryHash)
)
queues.invQueue.put((pubkeyStreamNumber, inventoryHash))

def HandleGetMessageDataByDestinationHash(self, params):
Expand Down