From 229671f485f8e5e8f83f267acf7602d6e055a744 Mon Sep 17 00:00:00 2001 From: Justin Stephenson Date: Tue, 13 Aug 2019 15:05:16 -0400 Subject: [PATCH] Journal fixes Handle journal entries that may not contain the _EXE field. --- src/recordings.jsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/recordings.jsx b/src/recordings.jsx index 9472df7..d45a8ac 100644 --- a/src/recordings.jsx +++ b/src/recordings.jsx @@ -719,7 +719,10 @@ class View extends React.Component { * Assumes journalctl is not running. */ journalctlStart() { - let matches = ["_EXE=/usr/bin/tlog-rec-session", "_EXE=/usr/bin/tlog-rec"]; + let matches = ["_EXE=/usr/bin/tlog-rec-session", + "_EXE=/usr/bin/tlog-rec", "+", + "_COMM=tlog-rec", "+", + "_COMM=tlog-rec-session"]; if (this.state.username && this.state.username !== "") { matches.push("TLOG_USER=" + this.state.username); } @@ -727,7 +730,7 @@ class View extends React.Component { matches.push("_HOSTNAME=" + this.state.hostname); } - let options = {follow: true, count: "all", merge: true}; + let options = {follow: false, count: "all", merge: true}; if (this.state.date_since && this.state.date_since !== "") { options['since'] = this.state.date_since;