Merge #10076: [qa] combine_logs: Use ordered list for logfiles

fa4535d [qa] combine_logs: Use ordered list for logfiles (MarcoFalke)

Tree-SHA512: 66da6f2659018d24b1cac1f6d2ee8603c2c6f15ce5aff456e8e4b208874e97c7046b97112046d5b45bfd777b405771a3ad0a55036c4f4cdeec06842563af2c4d
This commit is contained in:
MarcoFalke 2017-03-28 14:44:53 +02:00
commit 5b029aaedb
No known key found for this signature in database
GPG key ID: D2EA4850E7528B25

View file

@ -6,8 +6,8 @@ to write to an outputfile."""
import argparse
from collections import defaultdict, namedtuple
import glob
import heapq
import itertools
import os
import re
import sys
@ -49,7 +49,10 @@ def read_logs(tmp_dir):
for each of the input log files."""
files = [("test", "%s/test_framework.log" % tmp_dir)]
for i, logfile in enumerate(glob.glob("%s/node*/regtest/debug.log" % tmp_dir)):
for i in itertools.count():
logfile = "{}/node{}/regtest/debug.log".format(tmp_dir, i)
if not os.path.isfile(logfile):
break
files.append(("node%d" % i, logfile))
return heapq.merge(*[get_log_events(source, f) for source, f in files])