arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-22 22:38:08 +00:00
Code Issues Releases Wiki Activity

logging: convenience function to set up protobuf logging

Browse Source
This commit is contained in:
matejcik 2018-05-09 18:09:31 +02:00
parent 1e4c1c093e
commit ca8ebacab9
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
trezorctl
View File

@ -28,7 +28,7 @@ import logging
import os
import sys
from trezorlib.client import TrezorClient, TrezorClientVerbose, CallException
from trezorlib.client import TrezorClient, CallException
from trezorlib.transport import get_transport, enumerate_devices
from trezorlib import coins
from trezorlib import log
@ -67,11 +67,7 @@ CHOICE_OUTPUT_SCRIPT_TYPE = ChoiceType({
def enable_logging():
handler = logging.StreamHandler()
handler.setFormatter(log.PrettyProtobufFormatter())
logger = logging.getLogger('trezorlib')
logger.setLevel(logging.DEBUG)
logger.addHandler(handler)
log.enable_debug_output()
log.OMITTED_MESSAGES.add(proto.Features)

23
trezorlib/log.py
View File

@ -1,5 +1,5 @@
import logging
from typing import Set, Type
from typing import Set, Type, Optional
from . import protobuf
@ -8,12 +8,27 @@ OMITTED_MESSAGES = set() # type: Set[Type[protobuf.MessageType]]
class PrettyProtobufFormatter(logging.Formatter):
def format(self, record):
def format(self, record: logging.LogRecord) -> str:
time = self.formatTime(record)
message = '[{time}] {level}: {msg}'.format(time=time, level=record.levelname, msg=super().format(record))
message = '[{time}] {source} {level}: {msg}'.format(
time=time, level=record.levelname.upper(),
source=record.name,
msg=super().format(record))
if hasattr(record, 'protobuf'):
if type(record.protobuf) in OMITTED_MESSAGES:
message += " ({} bytes)".format(record.protobuf.ByteSize())
else:
message += "\n" + protobuf.format_message(record.protobuf)
message += "\n" + protobuf.format_message(record.protobuf, collapse_cointypes=True)
return message
def enable_debug_output(handler: Optional[logging.Handler] = None):
if handler is None:
handler = logging.StreamHandler()
formatter = PrettyProtobufFormatter()
handler.setFormatter(formatter)
logger = logging.getLogger('trezorlib')
logger.setLevel(logging.DEBUG)
logger.addHandler(handler)