From 35e38be698e44bbe8cbf036293edaf5dce029396 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Mon, 30 Apr 2018 16:37:12 -0400 Subject: [PATCH] Fix wrong event_type when getting buffered live logs for crunch2. refs #12690 Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- tools/crunchstat-summary/crunchstat_summary/reader.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/crunchstat-summary/crunchstat_summary/reader.py b/tools/crunchstat-summary/crunchstat_summary/reader.py index e8f0861be4..98dda673d5 100644 --- a/tools/crunchstat-summary/crunchstat_summary/reader.py +++ b/tools/crunchstat-summary/crunchstat_summary/reader.py @@ -46,8 +46,9 @@ class LiveLogReader(object): EOF = None def __init__(self, job_uuid): - logger.debug('load stderr events for job %s', job_uuid) self.job_uuid = job_uuid + self.event_types = (['stderr'] if '-8i9sb-' in job_uuid else ['crunchstat', 'arv-mount']) + logger.debug('load %s events for job %s', self.event_types, self.job_uuid) def __str__(self): return self.job_uuid @@ -57,7 +58,7 @@ class LiveLogReader(object): last_id = 0 filters = [ ['object_uuid', '=', self.job_uuid], - ['event_type', '=', 'stderr']] + ['event_type', 'in', self.event_types]] try: while True: page = arvados.api().logs().index( -- 2.30.2