add line for luci.log

fix exception handling during diagnose


git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@971 ef72aa8b-4018-0410-8976-d6e080ef94d8

2 files changed, 7 insertions, 0 deletions

diff --git a/sos/plugins/cluster.py b/sos/plugins/cluster.py
index 67fa9dfd..e60ccf92 100644
--- a/sos/plugins/cluster.py
+++ b/sos/plugins/cluster.py
@@ -239,6 +239,7 @@ class cluster(sos.plugintools.PluginBase):
         self.collectExtOutput("gfs_control dump", root_symlink="gfs_controld.txt")
         self.collectExtOutput("dlm_tool log_plock", root_symlink="log_plock.txt")
         self.addCopySpec("/var/log/cluster")
+        self.addCopySpec("/var/log/luci/luci.log")
         
         self.collectExtOutput("clustat")
 
diff --git a/sos/sosreport.py b/sos/sosreport.py
index 58cc23e6..5492748a 100755
--- a/sos/sosreport.py
+++ b/sos/sosreport.py
@@ -653,6 +653,12 @@ No changes will be made to your system.
             except:
                 if GlobalVars.__raisePlugins__:
                     raise
+                else:
+                    error_log = open(logdir + "/sosreport-plugin-errors.txt", "a")
+                    traceback.print_exception(etype, eval, etrace, limit=2, file=sys.stdout)
+                    error_log.write(traceback.format_exc)
+                    error_log.close()
+
             tmpcount += len(plug.diagnose_msgs)
         if tmpcount > 0:
             print _("One or more plugins have detected a problem in your " \