aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshnavid <shnavid@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-07-18 11:06:31 +0000
committershnavid <shnavid@ef72aa8b-4018-0410-8976-d6e080ef94d8>2007-07-18 11:06:31 +0000
commitafdd1f418fd0fef7c0211fdf3f19e279feeb265d (patch)
tree95925db9603f91a684279c6217c77ece542bc4a9
parent43619337f903c598078ef0640e7d5d75a49933ce (diff)
downloadsos-afdd1f418fd0fef7c0211fdf3f19e279feeb265d.tar.gz
* thread count semaphore was not passed to thread
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@220 ef72aa8b-4018-0410-8976-d6e080ef94d8
-rw-r--r--src/lib/sos/plugintools.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/sos/plugintools.py b/src/lib/sos/plugintools.py
index 43a17a75..238036ce 100644
--- a/src/lib/sos/plugintools.py
+++ b/src/lib/sos/plugintools.py
@@ -94,7 +94,7 @@ class PluginBase:
except KeyboardInterrupt:
raise KeyboardInterrupt
except Exception, e:
- self.soslog.log(logging.VERBOSE, "Problem at path %s (%s)\n" % (abspath,e))
+ self.soslog.log(logging.VERBOSE, "Problem at path %s (%s)" % (abspath,e))
break
return False
@@ -425,13 +425,13 @@ class PluginBase:
Collect the data for a plugin
"""
if threaded and self.thread == None:
- self.thread = Thread(target=self.copyStuff, name=self.piName+'-thread', args = [True] )
+ self.thread = Thread(target=self.copyStuff, name=self.piName+'-thread', args = [True, semaphore] )
self.thread.start()
return self.thread
if semaphore: semaphore.acquire()
- self.soslog.log(logging.VERBOSE2, "starting threaded plugin %s" % self.piName)
+ self.soslog.log(logging.VERBOSE, "starting threaded plugin %s" % self.piName)
self.time_start = time()
self.time_stop = None
@@ -462,6 +462,7 @@ class PluginBase:
self.time_stop = time()
if semaphore: semaphore.release()
+ self.soslog.log(logging.VERBOSE, "plugin %s returning" % self.piName)
def get_description(self):
""" This function will return the description for the plugin"""