internal: cleaner fix for binary gibberish in logs

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>

diff --git a/teuthology/task/internal.py b/teuthology/task/internal.py
index 00b179a2245cdb3ae9b77bddc2060287691df471..d4df0b45ad0a4223abc6f989d2a9c3c25a1cb79f 100644 (file)
--- a/teuthology/task/internal.py
+++ b/teuthology/task/internal.py
@@ -488,13 +488,9 @@ kern.* -{adir}/syslog/kern.log;RSYSLOG_FileFormat
             log.debug('Checking %s', remote.name)
             r = remote.run(
                 args=[
-                    'cat',
-                    run.Raw('{adir}/syslog/*.log'.format(adir=archive_dir)),
-                    run.Raw('|'),
-                    'tr', '[\\000-\\011\\013-\\037\\177-\\377]', '.',
-                    run.Raw('|'),
-                    'egrep',
+                    'egrep', '--binary-files=text',
                     '\\bBUG\\b|\\bINFO\\b|\\bDEADLOCK\\b',
+                    run.Raw('{adir}/syslog/*.log'.format(adir=archive_dir)),
                     run.Raw('|'),
                     'grep', '-v', 'task .* blocked for more than .* seconds',
                     run.Raw('|'),