diff options
| author | Kazuhito Hagio <k-hagio@ab.jp.nec.com> | 2018-05-22 15:29:47 -0400 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2018-05-24 15:34:23 +0100 |
| commit | 2c04f56675b36f59ab4d4cb455efeb7d71badb74 (patch) | |
| tree | 6381451f13e6b3f12ca0b27882ee9c2aca7b9bee | |
| parent | 7bc6556eaabed9a3cb0d1ab3a863e6de3a9eb742 (diff) | |
| download | sos-2c04f56675b36f59ab4d4cb455efeb7d71badb74.tar.gz | |
[logs] rework: collect journalctl verbosed logs with --all-logs only
commit 7bc90f618f0549279544d26effae2e5197d85e2b ("[logs] collect
journalctl verbosed logs with --all-logs only") did not suppress
the journalctl verbosed logs by default. Let's rework it.
Related: #1225
Resolves: #1310
Signed-off-by: Kazuhito Hagio <k-hagio@ab.jp.nec.com>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/logs.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sos/plugins/logs.py b/sos/plugins/logs.py index 1d18bad8..c67d3e66 100644 --- a/sos/plugins/logs.py +++ b/sos/plugins/logs.py @@ -29,9 +29,7 @@ class Logs(Plugin): self.add_copy_spec("/var/log/boot.log", sizelimit=self.limit) self.add_copy_spec("/var/log/cloud-init*", sizelimit=self.limit) self.add_journal(boot="this", catalog=True) - self.add_journal(boot="this", allfields=True, output="verbose") self.add_journal(boot="last", catalog=True) - self.add_journal(boot="last", allfields=True, output="verbose") self.add_cmd_output("journalctl --disk-usage") confs = ['/etc/syslog.conf', '/etc/rsyslog.conf'] @@ -57,6 +55,7 @@ class Logs(Plugin): if self.get_option('all_logs'): self.add_journal(boot="this", allfields=True, output="verbose") + self.add_journal(boot="last", allfields=True, output="verbose") def postproc(self): self.do_path_regex_sub( |