Minor refactoring

This commit is contained in:
Miroslav Stampar 2012-08-21 10:28:25 +02:00
parent 7a8ace78f9
commit b7415d36df
3 changed files with 4 additions and 4 deletions

View File

@ -107,12 +107,12 @@ def main():
kb.threadContinue = False kb.threadContinue = False
kb.threadException = True kb.threadException = True
if conf.get("hashDB", None): if conf.get("hashDB"):
try: try:
conf.hashDB.flush(True) conf.hashDB.flush(True)
except KeyboardInterrupt: except KeyboardInterrupt:
pass pass
# Reference: http://stackoverflow.com/questions/1635080/terminate-a-multi-thread-python-program # Reference: http://stackoverflow.com/questions/1635080/terminate-a-multi-thread-python-program
if conf.get("threads", 0) > 1 or conf.get("dnsServer", None): if conf.get("threads", 0) > 1 or conf.get("dnsServer"):
os._exit(0) os._exit(0)

View File

@ -195,7 +195,7 @@ def runThreads(numThreads, threadFunction, cleanupFunction=None, forwardExceptio
if lock.locked_lock(): if lock.locked_lock():
lock.release() lock.release()
if conf.get("hashDB", None): if conf.get("hashDB"):
conf.hashDB.flush(True) conf.hashDB.flush(True)
if cleanupFunction: if cleanupFunction:

View File

@ -57,7 +57,7 @@ class HashDB(object):
retVal = None retVal = None
if key and (self._write_cache or os.path.isfile(self.filepath)): if key and (self._write_cache or os.path.isfile(self.filepath)):
hash_ = HashDB.hashKey(key) hash_ = HashDB.hashKey(key)
retVal = self._write_cache.get(hash_, None) retVal = self._write_cache.get(hash_)
if not retVal: if not retVal:
while True: while True:
try: try: