diff options
| author | Adam Stokes <adam.stokes@ubuntu.com> | 2014-04-09 11:42:43 -0400 |
|---|---|---|
| committer | Adam Stokes <adam.stokes@ubuntu.com> | 2014-04-09 11:42:43 -0400 |
| commit | 422046e225c9c72df1ab4517909a922918f76fdc (patch) | |
| tree | f48dba37fbcb0be028312432a04e0b7350ba9efc | |
| parent | adc1be1ecab468aed5dbac64b7b7d1ce0cc92180 (diff) | |
| download | sos-422046e225c9c72df1ab4517909a922918f76fdc.tar.gz | |
Combine debian and ubuntu basic log gathering classes
The plugin list shows logs twice for Ubuntu and Debian systems. Since the
variations between the 2 are minimal we are combining those classes.
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
| -rw-r--r-- | sos/plugins/logs.py | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/sos/plugins/logs.py b/sos/plugins/logs.py index 54fdfe33..bd87e9d5 100644 --- a/sos/plugins/logs.py +++ b/sos/plugins/logs.py @@ -60,8 +60,8 @@ class RedHatLogs(Logs, RedHatPlugin): self.add_copy_spec_limit("/var/log/messages*", sizelimit = self.limit) -class DebianLogs(Logs, DebianPlugin): - """Basic system information for Debian based distributions""" +class DebianLogs(Logs, DebianPlugin, UbuntuPlugin): + """Basic system information for Debian and Ubuntu based distributions""" def setup(self): super(DebianLogs, self).setup() @@ -73,15 +73,6 @@ class DebianLogs(Logs, DebianPlugin): "/var/log/dist-upgrade", "/var/log/installer", "/var/log/unattended-upgrades" - ]) - - -class UbuntuLogs(Logs, UbuntuPlugin): - """Basic system information for Ubuntu based distributions""" - - def setup(self): - super(UbuntuLogs, self).setup() - self.add_copy_specs([ "/var/log/apport.log", "/var/log/landscape", ]) |