Skip to content

Commit f941675

Browse files
committed
Merge bitcoin/bitcoin#32676: test: apply microsecond precision to test framework logging
ed179e0 test: apply microsecond precision to test framework logging (Martin Zumsande) Pull request description: When analyzing functional test logs (produced with `combine_logs.py`), entries sometimes sort slightly out of order because even though python prints 6 digits for microsecond precision, it fills up the last 3 digits with zeroes. For example, it may look like a message was received by the test framework before it was sent by the node. Change this to actually use microsecond precision - this should make combined logs a little bit easier to analyze. ACKs for top commit: davidgumberg: Tested ACK bitcoin/bitcoin@ed179e0 achow101: ACK ed179e0 maflcko: review ACK ed179e0 🗳 janb84: ACK ed179e0 Tree-SHA512: 55cdb5024e8e910c5a5ce741ce512eb88f4f82f11f378ba0fe7a5a2b1c97d2e7b540bdf5603c76aab837d35798610b165f087fbeb7c9dc90aaad890bf4d0323d
2 parents 0dcb452 + ed179e0 commit f941675

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

test/functional/test_framework/test_framework.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import configparser
88
from enum import Enum
99
import argparse
10+
from datetime import datetime, timezone
1011
import logging
1112
import os
1213
import platform
@@ -837,9 +838,16 @@ def _start_logging(self):
837838
# User can provide log level as a number or string (eg DEBUG). loglevel was caught as a string, so try to convert it to an int
838839
ll = int(self.options.loglevel) if self.options.loglevel.isdigit() else self.options.loglevel.upper()
839840
ch.setLevel(ll)
841+
840842
# Format logs the same as bitcoind's debug.log with microprecision (so log files can be concatenated and sorted)
841-
formatter = logging.Formatter(fmt='%(asctime)s.%(msecs)03d000Z %(name)s (%(levelname)s): %(message)s', datefmt='%Y-%m-%dT%H:%M:%S')
842-
formatter.converter = time.gmtime
843+
class MicrosecondFormatter(logging.Formatter):
844+
def formatTime(self, record, _=None):
845+
dt = datetime.fromtimestamp(record.created, timezone.utc)
846+
return dt.strftime('%Y-%m-%dT%H:%M:%S.%f')
847+
848+
formatter = MicrosecondFormatter(
849+
fmt='%(asctime)sZ %(name)s (%(levelname)s): %(message)s',
850+
)
843851
fh.setFormatter(formatter)
844852
ch.setFormatter(formatter)
845853
# add the handlers to the logger

0 commit comments

Comments
 (0)