minor fix (turning back the functionality of kb.suppressResumeInfo)

This commit is contained in:
Miroslav Stampar 2012-06-25 16:19:51 +00:00
parent ea5d483c86
commit 6c4bd84d18
3 changed files with 2 additions and 3 deletions

View File

@ -163,7 +163,7 @@ def __errorFields(expression, expressionFields, expressionFieldsList, expected=N
if not kb.threadContinue: if not kb.threadContinue:
return None return None
if output is not None: if output is not None and not (threadData.resumed and kb.suppressResumeInfo):
dataToStdout("[%s] [INFO] %s: %s\r\n" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(output))) dataToStdout("[%s] [INFO] %s: %s\r\n" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(output)))
if isinstance(num, int): if isinstance(num, int):

View File

@ -314,7 +314,7 @@ def unionUse(expression, unpack=True, dump=False):
else: else:
items = output.replace(kb.chars.start, "").replace(kb.chars.stop, "").split(kb.chars.delimiter) items = output.replace(kb.chars.start, "").replace(kb.chars.stop, "").split(kb.chars.delimiter)
if conf.verbose == 1: if conf.verbose == 1 and not (threadData.resumed and kb.suppressResumeInfo):
status = "[%s] [INFO] %s: %s" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(",".join("\"%s\"" % _ for _ in flattenValue(arrayizeValue(items))))) status = "[%s] [INFO] %s: %s" % (time.strftime("%X"), "resumed" if threadData.resumed else "retrieved", safecharencode(",".join("\"%s\"" % _ for _ in flattenValue(arrayizeValue(items)))))
if len(status) > width: if len(status) > width:

View File

@ -129,4 +129,3 @@ class Crawler:
else: else:
for url in threadData.shared.outputs: for url in threadData.shared.outputs:
kb.targetUrls.add(( url, None, None, None )) kb.targetUrls.add(( url, None, None, None ))
kb.suppressResumeInfo = False