minor update regarding last commit

This commit is contained in:
Miroslav Stampar 2012-01-13 15:56:50 +00:00
parent ff96c537a9
commit 1f53ff0633

View File

@ -19,9 +19,8 @@ from lib.core.data import kb
from lib.core.data import logger from lib.core.data import logger
from lib.core.datatype import AttribDict from lib.core.datatype import AttribDict
from lib.core.enums import PAYLOAD from lib.core.enums import PAYLOAD
from lib.core.exception import sqlmapConnectionException from lib.core.exception import exceptionsTuple
from lib.core.exception import sqlmapThreadException from lib.core.exception import sqlmapThreadException
from lib.core.exception import sqlmapValueException
from lib.core.settings import MAX_NUMBER_OF_THREADS from lib.core.settings import MAX_NUMBER_OF_THREADS
from lib.core.settings import PYVERSION from lib.core.settings import PYVERSION
@ -168,11 +167,20 @@ def runThreads(numThreads, threadFunction, cleanupFunction=None, forwardExceptio
if forwardException: if forwardException:
raise raise
except Exception, errMsg: except exceptionsTuple, errMsg:
print print
kb.threadException = True kb.threadException = True
logger.error("thread %s: '%s'" % (threading.currentThread().getName(), errMsg)) logger.error("thread %s: '%s'" % (threading.currentThread().getName(), errMsg))
except:
from lib.core.common import unhandledExceptionMessage
print
kb.threadException = True
errMsg = unhandledExceptionMessage()
logger.error("thread %s: '%s'" % (threading.currentThread().getName(), errMsg))
traceback.print_exc()
finally: finally:
kb.multiThreadMode = False kb.multiThreadMode = False
kb.bruteMode = False kb.bruteMode = False