Bitmessage/MiNode
3
0
Fork 1
Code Pull Requests 9 Actions Activity

Change logging messages

Browse Source
This commit is contained in:
TheKysek 2017-08-23 18:58:22 +02:00
parent 5e949d0e01
commit e83fc0d838
No known key found for this signature in database
GPG Key ID: 50D9AF00D0B1C497
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
minode/main.py
View File

@ -235,8 +235,11 @@ def main():
for vector in set(shared.objects): for vector in set(shared.objects):
if not shared.objects[vector].is_valid(): if not shared.objects[vector].is_valid():
del shared.objects[vector] if shared.objects[vector].is_expired():
logging.debug('Deleted expired object: {}'.format(base64.b16encode(vector).decode()))
else:
logging.warning('Deleted invalid object: {}'.format(base64.b16encode(vector).decode())) logging.warning('Deleted invalid object: {}'.format(base64.b16encode(vector).decode()))
del shared.objects[vector]
manager = Manager() manager = Manager()
manager.start() manager.start()

10
minode/structure.py
View File

@ -82,16 +82,16 @@ class Object(object):
def is_valid(self): def is_valid(self):
if self.is_expired(): if self.is_expired():
logging.warning('Rejecting object {}, reason: is_expired'.format(base64.b16encode(self.vector).decode())) logging.debug('Invalid object {}, reason: expired'.format(base64.b16encode(self.vector).decode()))
return False return False
if self.expires_time > time.time() + 28 * 24 * 3600 + 3 * 3600: if self.expires_time > time.time() + 28 * 24 * 3600 + 3 * 3600:
logging.warning('Rejecting object {}, reason: end of life too far into the future'.format(base64.b16encode(self.vector).decode())) logging.warning('Invalid object {}, reason: end of life too far in the future'.format(base64.b16encode(self.vector).decode()))
return False return False
if len(self.object_payload) > 2**18: if len(self.object_payload) > 2**18:
logging.warning('Rejecting object {}, reason: len(payload) > 2**18'.format(base64.b16encode(self.vector).decode())) logging.warning('Invalid object {}, reason: payload is too long'.format(base64.b16encode(self.vector).decode()))
return False return False
if self.stream_number != 1: if self.stream_number != 1:
logging.warning('Rejecting object {}, reason: not in stream 1'.format(base64.b16encode(self.vector).decode())) logging.warning('Invalid object {}, reason: not in stream 1'.format(base64.b16encode(self.vector).decode()))
return False return False
data = self.to_bytes()[8:] data = self.to_bytes()[8:]
length = len(data) + 8 + shared.payload_length_extra_bytes length = len(data) + 8 + shared.payload_length_extra_bytes
@ -100,7 +100,7 @@ class Object(object):
pow_value = int.from_bytes(hashlib.sha512(hashlib.sha512(self.nonce + h).digest()).digest()[:8], 'big') pow_value = int.from_bytes(hashlib.sha512(hashlib.sha512(self.nonce + h).digest()).digest()[:8], 'big')
target = self.pow_target() target = self.pow_target()
if target < pow_value: if target < pow_value:
logging.warning('Rejecting object {}, reason: insufficient pow'.format(base64.b16encode(self.vector).decode())) logging.warning('Invalid object {}, reason: insufficient pow'.format(base64.b16encode(self.vector).decode()))
return False return False
return True return True