code refactoring regarding standard output suppression and some threading issues

lib/core/common.py

@@ -427,7 +427,9 @@ def filePathToString(filePath):
     return strRepl
 
 def dataToStdout(data, forceOutput=False):
-    if forceOutput or conf.verbose > 0:
+    if (forceOutput or conf.verbose > 0)\
+        and not ('threadException' in kb and kb.threadException)\
+        and not ('disableStdOut' in kb and kb.disableStdOut):
         try:
             sys.stdout.write(data)
             sys.stdout.flush()

lib/core/option.py

@@ -1119,7 +1119,6 @@ def __setConfAttributes():
     conf.sessionFP        = None
     conf.start            = True
     conf.tests            = []
-    conf.threadException  = False
     conf.trafficFP        = None
     conf.wFileType        = None
 
@@ -1144,6 +1143,7 @@ def __setKnowledgeBaseAttributes(flushAll=True):
     kb.commonOutputs   = None
 
     kb.data            = advancedDict()
+    kb.disableStdOut   = False
 
     # Old style injection flag
     kb.unionTest       = None
@@ -1196,6 +1196,7 @@ def __setKnowledgeBaseAttributes(flushAll=True):
     kb.testMode        = False
     kb.testQueryCount  = 0
     kb.threadContinue  = True
+    kb.threadException = False
     kb.threadData      = {}
     kb.unionComment    = ""
     kb.unionCount      = None