- if containersapi or not crunchstat_re.match(l):
- logtail.append(l)
- if len(logcollection) > 1:
- logtail = sorted(logtail)[-maxlen:]
- logtxt = "\n ".join(l.strip() for l in logtail)
+ if containersapi:
+ g = timestamp_re.match(l)
+ logt.append((g.group(1), g.group(2)))
+ elif not crunchstat_re.match(l):
+ logt.append(l)
+
+ if containersapi:
+ keys = mergelogs.keys()
+ loglines = []
+ while True:
+ earliest = None
+ for k in keys:
+ if mergelogs[k]:
+ if earliest is None or mergelogs[k][0][0] < mergelogs[earliest][0][0]:
+ earliest = k
+ if earliest is None:
+ break
+ ts, msg = mergelogs[earliest].popleft()
+ loglines.append("%s %s %s" % (ts, earliest, msg))
+ loglines = loglines[-maxlen:]
+ else:
+ loglines = mergelogs.values()[0]
+
+ logtxt = "\n ".join(l.strip() for l in loglines)