diff options
| author | Bryn M. Reeves <bmr@redhat.com> | 2012-12-06 13:36:38 +0000 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2012-12-06 13:54:56 +0000 |
| commit | 6da2ca7e6bc5f0a643c992808ec93e3ba998bd4a (patch) | |
| tree | 8251830eb10058896471e167028993b2e2f31f18 | |
| parent | 30b42e422a5700f5d85499be1c79fee86d804469 (diff) | |
| download | sos-6da2ca7e6bc5f0a643c992808ec93e3ba998bd4a.tar.gz | |
Restore exception handling and logging in copy_stuff()
Now that collectOutputNow is fixed restore the exception handling
block and logging in copy_stuff().
| -rw-r--r-- | sos/plugins/__init__.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sos/plugins/__init__.py b/sos/plugins/__init__.py index 823b5aca..3378712f 100644 --- a/sos/plugins/__init__.py +++ b/sos/plugins/__init__.py @@ -569,13 +569,13 @@ class Plugin(object): for progs in izip(self.collectProgs): prog, suggest_filename, root_symlink, timeout = progs[0] - # self.soslog.debug("collecting output of '%s'" % prog) -# try: - self.collectOutputNow(prog, suggest_filename, + self.soslog.debug("collecting output of '%s'" % prog) + try: + self.collectOutputNow(prog, suggest_filename, root_symlink, timeout) -# except Exception, e: -# self.soslog.debug("error collecting output of '%s' (%s)" -# % (prog, e)) + except Exception, e: + self.soslog.debug("error collecting output of '%s' (%s)" + % (prog, e)) def exit_please(self): """ This function tells the plugin that it should exit ASAP""" |