|
 |
629484 |
commit c8ea3f5e17e48c577d8f6dde6ac0b782b72f98d6
|
|
|
629484 |
Author: Bryn M. Reeves <bmr@redhat.com>
|
|
|
629484 |
Date: Mon Nov 18 12:52:40 2013 +0000
|
|
|
629484 |
|
|
|
629484 |
Change default console log level to WARNING to match sos-2.2
|
|
|
629484 |
|
|
|
629484 |
Commit 6ea48cb changed the default log level for console output
|
|
|
629484 |
from WARNING to ERROR and reclassified several messages.
|
|
|
629484 |
|
|
|
629484 |
This causes plug-in validation messages to be silent at the
|
|
|
629484 |
default verbosity.
|
|
|
629484 |
|
|
|
629484 |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
629484 |
|
|
|
629484 |
diff --git a/sos/sosreport.py b/sos/sosreport.py
|
|
|
629484 |
index 4ea5f95..595015f 100644
|
|
|
629484 |
--- a/sos/sosreport.py
|
|
|
629484 |
+++ b/sos/sosreport.py
|
|
|
629484 |
@@ -669,7 +669,7 @@ class SoSReport(object):
|
|
|
629484 |
elif self.opts.verbosity > 0:
|
|
|
629484 |
console.setLevel(logging.INFO)
|
|
|
629484 |
else:
|
|
|
629484 |
- console.setLevel(logging.ERROR)
|
|
|
629484 |
+ console.setLevel(logging.WARNING)
|
|
|
629484 |
self.soslog.addHandler(console)
|
|
|
629484 |
|
|
|
629484 |
# ui log
|
|
|
629484 |
commit c2ab28f7fb159f149314a83f2493739f2d2aa88b
|
|
|
629484 |
Author: Bryn M. Reeves <bmr@redhat.com>
|
|
|
629484 |
Date: Mon Nov 18 13:02:19 2013 +0000
|
|
|
629484 |
|
|
|
629484 |
Reclasify 'error' messages as 'warning'
|
|
|
629484 |
|
|
|
629484 |
Several log messages used the 'error' level when reporting an
|
|
|
629484 |
event that is not necessarily an error (and does not prevent sos
|
|
|
629484 |
from continuing).
|
|
|
629484 |
|
|
|
629484 |
Reclassify these to the 'warning' log level instead.
|
|
|
629484 |
|
|
|
629484 |
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
|
629484 |
|
|
|
629484 |
diff --git a/sos/plugins/kernel.py b/sos/plugins/kernel.py
|
|
|
629484 |
index 1afe9df..f96fe6c 100644
|
|
|
629484 |
--- a/sos/plugins/kernel.py
|
|
|
629484 |
+++ b/sos/plugins/kernel.py
|
|
|
629484 |
@@ -32,7 +32,7 @@ class Kernel(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin):
|
|
|
629484 |
modules = os.listdir(self.sys_module)
|
|
|
629484 |
self.add_cmd_output("modinfo " + " ".join(modules))
|
|
|
629484 |
except OSError:
|
|
|
629484 |
- self.soslog.error("could not list %s" % self.sys_module)
|
|
|
629484 |
+ self.soslog.warning("could not list %s" % self.sys_module)
|
|
|
629484 |
|
|
|
629484 |
self.add_cmd_output("dmesg")
|
|
|
629484 |
self.add_cmd_output("sysctl -a")
|
|
|
629484 |
diff --git a/sos/plugins/sar.py b/sos/plugins/sar.py
|
|
|
629484 |
index 570262a..1086208 100644
|
|
|
629484 |
--- a/sos/plugins/sar.py
|
|
|
629484 |
+++ b/sos/plugins/sar.py
|
|
|
629484 |
@@ -47,7 +47,7 @@ class Sar(Plugin,):
|
|
|
629484 |
try:
|
|
|
629484 |
dirList = os.listdir(self.sa_path)
|
|
|
629484 |
except:
|
|
|
629484 |
- self.soslog.error("sar: could not list /var/log/sa")
|
|
|
629484 |
+ self.soslog.warning("sar: could not list /var/log/sa")
|
|
|
629484 |
return
|
|
|
629484 |
# find all the sa file that don't have an existing sar file
|
|
|
629484 |
for fname in dirList:
|
|
|
629484 |
diff --git a/sos/sosreport.py b/sos/sosreport.py
|
|
|
629484 |
index 595015f..1c81af9 100644
|
|
|
629484 |
--- a/sos/sosreport.py
|
|
|
629484 |
+++ b/sos/sosreport.py
|
|
|
629484 |
@@ -772,13 +772,13 @@ class SoSReport(object):
|
|
|
629484 |
|
|
|
629484 |
for plugin_class in plugin_classes:
|
|
|
629484 |
if not self.policy.validatePlugin(plugin_class):
|
|
|
629484 |
- self.soslog.debug(_("plugin %s does not validate, skipping") % plug)
|
|
|
629484 |
+ self.soslog.warning(_("plugin %s does not validate, skipping") % plug)
|
|
|
629484 |
if self.opts.verbosity > 0:
|
|
|
629484 |
self._skip(plugin_class, _("does not validate"))
|
|
|
629484 |
continue
|
|
|
629484 |
|
|
|
629484 |
if plugin_class.requires_root and not self._is_root:
|
|
|
629484 |
- self.soslog.debug(_("plugin %s requires root permissions to execute, skipping") % plug)
|
|
|
629484 |
+ self.soslog.info(_("plugin %s requires root permissions to execute, skipping") % plug)
|
|
|
629484 |
self._skip(plugin_class, _("requires root"))
|
|
|
629484 |
continue
|
|
|
629484 |
|