diff options
| author | Bryan Quigley <bryan.quigley@canonical.com> | 2015-04-27 13:23:34 -0400 |
|---|---|---|
| committer | Adam Stokes <adam.stokes@ubuntu.com> | 2015-05-05 08:14:38 -0400 |
| commit | cbc968b15806de07ee9471b01e0c4e0e157f31aa (patch) | |
| tree | e9e6800180da606a49fc81d3bbd5cf2b5e861c9f | |
| parent | f8ab86cbd2302812cd9160bec4478cb4f84e1442 (diff) | |
| download | sos-cbc968b15806de07ee9471b01e0c4e0e157f31aa.tar.gz | |
[landscape] 15.01 moves logs files to landscape-server
Landscape Dedicated Server (LDS) 15.01 and newer logs are now
located in /var/log/landscape-server. They were previously
in only /var/log/landscape.
Also limited to log_size now.
Signed-off-by: Bryan Quigley <bryan.quigley@canonical.com>
Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>
| -rw-r--r-- | sos/plugins/landscape.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sos/plugins/landscape.py b/sos/plugins/landscape.py index 30298c21..9c74c8cb 100644 --- a/sos/plugins/landscape.py +++ b/sos/plugins/landscape.py @@ -31,9 +31,14 @@ class Landscape(Plugin, UbuntuPlugin): self.add_copy_spec("/etc/landscape/service.conf.old") self.add_copy_spec("/etc/default/landscape-server") if not self.get_option("all_logs"): - self.add_copy_spec("/var/log/landscape/*.log") + limit = self.get_option("log_size") + self.add_copy_spec_limit("/var/log/landscape/*.log", + sizelimit=limit) + self.add_copy_spec_limit("/var/log/landscape-server/*.log", + sizelimit=limit) else: self.add_copy_spec("/var/log/landscape") + self.add_copy_spec("/var/log/landscape-server") self.add_cmd_output("gpg --verify /etc/landscape/license.txt") self.add_cmd_output("head -n 5 /etc/landscape/license.txt") |