minor update

This commit is contained in:
Miroslav Stampar 2011-06-07 10:32:18 +00:00
parent e9bf768f23
commit 50dde39e68
2 changed files with 6 additions and 5 deletions

View File

@ -60,9 +60,10 @@ def exceptionHandledFunction(threadFunction):
kb.threadContinue = False kb.threadContinue = False
kb.threadException = True kb.threadException = True
raise raise
except: except Exception, errMsg:
kb.threadContinue = False # thread is just going to be silently killed
kb.threadException = True print
logger.error("thread %s: %s" % (threading.currentThread().getName(), errMsg))
def runThreads(numThreads, threadFunction, cleanupFunction=None, forwardException=True, threadChoice=False): def runThreads(numThreads, threadFunction, cleanupFunction=None, forwardException=True, threadChoice=False):
threads = [] threads = []

View File

@ -390,7 +390,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
except (sqlmapConnectionException, sqlmapValueException), errMsg: except (sqlmapConnectionException, sqlmapValueException), errMsg:
print print
kb.threadException = True kb.threadException = True
logger.error("thread %d: %s" % (numThread + 1, errMsg)) logger.error("thread %s: %s" % (threading.currentThread().getName(), errMsg))
except KeyboardInterrupt: except KeyboardInterrupt:
kb.threadException = True kb.threadException = True
@ -409,7 +409,7 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
print print
kb.threadException = True kb.threadException = True
errMsg = unhandledExceptionMessage() errMsg = unhandledExceptionMessage()
logger.error("thread %d: %s" % (numThread + 1, errMsg)) logger.error("thread %s: %s" % (threading.currentThread().getName(), errMsg))
traceback.print_exc() traceback.print_exc()
# Start the threads # Start the threads