more concise

This commit is contained in:
Miroslav Stampar
2011-06-08 14:35:23 +00:00
parent 6b81eef65a
commit 4a9640160e
9 changed files with 24 additions and 21 deletions

View File

@@ -23,7 +23,7 @@ from lib.core.common import getUnicode
from lib.core.common import isWindowsDriveLetterPath
from lib.core.common import posixToNtSlashes
from lib.core.common import sanitizeAsciiString
from lib.core.common import singleTimeLogMessage
from lib.core.common import singleTimeWarnMessage
from lib.core.data import conf
from lib.core.data import kb
from lib.core.data import logger
@@ -140,7 +140,7 @@ def checkCharEncoding(encoding):
except LookupError:
warnMsg = "unknown web page charset '%s'. " % encoding
warnMsg += "Please report by e-mail to %s." % ML
singleTimeLogMessage(warnMsg, logging.WARN, encoding)
singleTimeWarnMessage(warnMsg, logging.WARN, encoding)
encoding = None
return encoding
@@ -153,7 +153,7 @@ def getHeuristicCharEncoding(page):
retVal = detect(page)['encoding']
infoMsg = "heuristics detected web page charset '%s'" % retVal
singleTimeLogMessage(infoMsg, logging.INFO, retVal)
singleTimeWarnMessage(infoMsg, logging.INFO, retVal)
return retVal

View File

@@ -29,7 +29,7 @@ from lib.core.common import logHTTPTraffic
from lib.core.common import parseTargetUrl
from lib.core.common import readInput
from lib.core.common import removeReflectiveValues
from lib.core.common import singleTimeLogMessage
from lib.core.common import singleTimeWarnMessage
from lib.core.common import stdev
from lib.core.common import urlEncodeCookieValues
from lib.core.common import wasLastRequestDelayed
@@ -413,16 +413,16 @@ class Connect:
warnMsg += "without flag T in --technique option "
warnMsg += "(e.g. --flush-session --technique=BEUS) or try to "
warnMsg += "lower the --time-sec value (e.g. --time-sec=2)"
singleTimeLogMessage(warnMsg)
singleTimeWarnMessage(warnMsg)
elif kb.originalPage is None:
warnMsg = "if the problem persists please try to rerun "
warnMsg += "with the --random-agent switch turned on "
warnMsg += "and/or try to use proxy switches (--ignore-proxy, --proxy,...)"
singleTimeLogMessage(warnMsg)
singleTimeWarnMessage(warnMsg)
elif conf.threads > 1:
warnMsg = "if the problem persists please try to lower "
warnMsg += "the number of used threads (--threads)"
singleTimeLogMessage(warnMsg)
singleTimeWarnMessage(warnMsg)
time.sleep(1)