minor update

stamparm · stamparm · commit 50dde39e68da · 2011-06-07T10:32:18.000Z
diff --git a/lib/core/threads.py b/lib/core/threads.py
@@ -60,9 +60,10 @@ def exceptionHandledFunction(threadFunction):
         kb.threadContinue = False
         kb.threadException = True
         raise
-    except:
-        kb.threadContinue = False
-        kb.threadException = True
+    except Exception, errMsg:
+        # thread is just going to be silently killed
+        print
+        logger.error("thread %s: %s" % (threading.currentThread().getName(), errMsg))
 
 def runThreads(numThreads, threadFunction, cleanupFunction=None, forwardException=True, threadChoice=False):
     threads = []
diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
@@ -390,7 +390,7 @@ def downloadThread():
             except (sqlmapConnectionException, sqlmapValueException), errMsg:
                 print
                 kb.threadException = True
-                logger.error("thread %d: %s" % (numThread + 1, errMsg))
+                logger.error("thread %s: %s" % (threading.currentThread().getName(), errMsg))
 
             except KeyboardInterrupt:
                 kb.threadException = True
@@ -409,7 +409,7 @@ def downloadThread():
                 print
                 kb.threadException = True
                 errMsg = unhandledExceptionMessage()
-                logger.error("thread %d: %s" % (numThread + 1, errMsg))
+                logger.error("thread %s: %s" % (threading.currentThread().getName(), errMsg))
                 traceback.print_exc()
 
         # Start the threads
