test: Handle timestamps without microseconds in combine_logs #13157

pull laanwj wants to merge 1 commits into bitcoin:master from laanwj:2018_05_logcombine_timestamps changing 1 files +8 −6

laanwj commented at 12:03 PM on May 3, 2018: member

The log messages before command line arguments have been parsed will not have microseconds. Make parsing robust to lack of microseconds so that sorting is done correctly, and make their timestamps show as '.000000' to line up the log.

Before (note the weird sorting and ordering):

 node0 
2018-05-02T12:16:13Z 
 node1 
2018-05-02T12:16:13Z 
 node2 
2018-05-02T12:16:13Z 
 test  2018-05-02T12:16:13.310000Z TestFramework (INFO): Initializing test directory /tmp/testdssm30sn

After:

 node0 2018-05-02T12:16:13.000000Z  
 node1 2018-05-02T12:16:13.000000Z  
 node2 2018-05-02T12:16:13.000000Z  
 test  2018-05-02T12:16:13.310000Z TestFramework (INFO): Initializing test directory /tmp/testdssm30sn 
 test  2018-05-02T12:16:13.314000Z TestFramework.node0 (DEBUG): bitcoind started, waiting for RPC to come up 
 test  2018-05-02T12:16:13.316000Z TestFramework.node1 (DEBUG): bitcoind started, waiting for RPC to come up 
 test  2018-05-02T12:16:13.319000Z TestFramework.node2 (DEBUG): bitcoind started, waiting for RPC to come up

test: Handle timestamps without microseconds in combine_logs

The log messages before command line arguments have been parsed will
not have microseconds. Make parsing robust to lack of microseconds so
that sorting is done correctly, and make their timestamps show as
'.000000' to line up the log.

38afff30d7

laanwj added the label Tests on May 3, 2018

in test/functional/combine_logs.py:76 in 38afff30d7

  72 | @@ -73,10 +73,12 @@ def get_log_events(source, logfile):
  73 |                  # if this line has a timestamp, it's the start of a new log event.
  74 |                  time_match = TIMESTAMP_PATTERN.match(line)
  75 |                  if time_match:
  76 | -                    if event:
  77 | -                        yield LogEvent(timestamp=timestamp, source=source, event=event.rstrip())
  78 | -                    event = line
  79 | -                    timestamp = time_match.group()
  80 | +                    if event or timestamp:

laanwj commented at 12:04 PM on May 3, 2018:

Could keep this as if event to not show the (initial) empty log message. That's a matter of taste, I guess.

MarcoFalke commented at 3:29 PM on May 3, 2018: member

Noting that this is fixed by #13088
laanwj commented at 3:52 PM on May 3, 2018: member

Ok...
laanwj closed this on May 3, 2018
MarcoFalke commented at 2:46 PM on May 28, 2019: member
This is fixed in
- log: Log early messages #16112
as a side effect of changing the LogPrintf("\n\n\n\n\n"); into a FileWriteStr("\n\n\n\n\n", m_fileout);
MarcoFalke reopened this on May 28, 2019
MarcoFalke closed this on May 28, 2019
MarcoFalke referenced this in commit 0853d8d2fd on Jun 18, 2019
sidhujag referenced this in commit 6347640464 on Jun 19, 2019
DrahtBot locked this on Dec 16, 2021

Contributors

laanwj

MarcoFalke

Labels

Tests

Linked (view graph)

#16112 util: Log early messages