some fixes

This commit is contained in:
Miroslav Stampar
2011-01-07 16:39:47 +00:00
parent 16a06117f7
commit b313a20a3f
6 changed files with 10 additions and 10 deletions

View File

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

View File

@@ -1140,7 +1140,6 @@ def __setKnowledgeBaseAttributes(flushAll=True):
kb.commonOutputs = None
kb.data = advancedDict()
kb.disableStdOut = False
# Old style injection flag
kb.unionTest = None

View File

@@ -17,6 +17,7 @@ class ThreadData():
"""
def __init__(self):
self.disableStdOut = False
self.lastErrorPage = None
self.lastHTTPError = None
self.lastQueryDuration = 0