turning back on automatic adjusting of delays in time based queries

This commit is contained in:
Miroslav Stampar 2012-02-29 15:51:23 +00:00
parent 0205d96d7b
commit 37db27b720
2 changed files with 8 additions and 7 deletions

View File

@ -2036,11 +2036,11 @@ def adjustTimeDelay(lastQueryDuration, lowerStdLimit):
kb.delayCandidates = [candidate] + kb.delayCandidates[:-1] kb.delayCandidates = [candidate] + kb.delayCandidates[:-1]
if all([x == candidate for x in kb.delayCandidates]) and candidate < conf.timeSec: if all([x == candidate for x in kb.delayCandidates]) and candidate < conf.timeSec:
infoMsg = "due to good response times you can " conf.timeSec = candidate
infoMsg += "try to adjust the time-delay to "
infoMsg += "a more appropriate value (e.g. --time-sec=%d)" % candidate infoMsg = "adjusting time delay to "
singleTimeLogMessage(infoMsg) infoMsg += "%d second%s due to good response times" % (conf.timeSec, 's' if conf.timeSec > 1 else '')
kb.adjustTimeDelay = False logger.info(infoMsg)
def getLastRequestHTTPError(): def getLastRequestHTTPError():
""" """

View File

@ -274,15 +274,16 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
errMsg = "invalid character detected. retrying.." errMsg = "invalid character detected. retrying.."
logger.error(errMsg) logger.error(errMsg)
conf.timeSec += 1
warnMsg = "increasing time delay to %d second%s " % (conf.timeSec, 's' if conf.timeSec > 1 else '') warnMsg = "increasing time delay to %d second%s " % (conf.timeSec, 's' if conf.timeSec > 1 else '')
logger.warn(warnMsg) logger.warn(warnMsg)
conf.timeSec += 1
if kb.adjustTimeDelay: if kb.adjustTimeDelay:
dbgMsg = "turning off auto-adjustment mechanism" dbgMsg = "turning off auto-adjustment mechanism"
logger.debug(dbgMsg) logger.debug(dbgMsg)
kb.adjustTimeDelay = False kb.adjustTimeDelay = False
return getChar(idx, originalTbl, continuousOrder, expand, shiftTable) return getChar(idx, originalTbl, continuousOrder, expand, shiftTable)
else: else:
errMsg = "unable to properly validate last character value ('%s').." % decodeIntToUnicode(retVal) errMsg = "unable to properly validate last character value ('%s').." % decodeIntToUnicode(retVal)