code refactoring regarding standard output suppression and some threading issues

This commit is contained in:
Miroslav Stampar
2010-12-21 14:21:24 +00:00
parent 0e68248f60
commit 385e208f38
8 changed files with 27 additions and 18 deletions

View File

@@ -11,6 +11,7 @@ import re
import time
from lib.core.agent import agent
from lib.core.common import dataToStdout
from lib.core.common import extractRegexResult
from lib.core.common import getUnicode
from lib.core.common import initTechnique
@@ -60,9 +61,6 @@ def errorUse(expression):
if output:
output = output.replace(kb.misc.space, " ")
if conf.verbose > 0:
infoMsg = "retrieved: %s" % replaceNewlineTabs(output, stdout=True)
logger.info(infoMsg)
dataToStdout("\r[%s] [INFO] retrieved: %s" % (time.strftime("%X"), replaceNewlineTabs(output, stdout=True)))
return output