Revised some catch blocks.

This commit is contained in:
U-BASIS\dgrove 2018-09-26 15:40:08 -04:00
parent 56c4751bf8
commit 553fa7d6a2
8 changed files with 30 additions and 37 deletions

View File

@ -64,9 +64,8 @@ class BrowserLocationAnalyzer(general.AndroidComponentAnalyzer):
ContentUtils.writeToFile(abstractFile, jFile, context.dataSourceIngestIsCancelled)
self.__findGeoLocationsInDB(jFile.toString(), abstractFile)
except Exception as ex:
# Error parsing browser location files.
# Catch and proceed to the next file in the loop.
pass
self._logger.log(Level.SEVERE, "Error parsing browser location files", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
except TskCoreException as ex:
# Error finding browser location files.
pass
@ -118,8 +117,8 @@ class BrowserLocationAnalyzer(general.AndroidComponentAnalyzer):
# Unable to execute browser location SQL query against database.
pass
except Exception as ex:
# Error putting artifacts to blackboard.
pass
self._logger.log(Level.SEVERE, "Error putting artifacts to blackboard", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
finally:
try:
if resultSet is not None:

View File

@ -147,8 +147,8 @@ class CacheLocationAnalyzer(general.AndroidComponentAnalyzer):
# Unable to execute Cached GPS locations SQL query against database.
pass
except Exception as ex:
# Error parsing Cached GPS locations to blackboard.
pass
self._logger.log(Level.SEVERE, "Error parsing Cached GPS locations to blackboard", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
def toDouble(byteArray):
return ByteBuffer.wrap(byteArray).getDouble()

View File

@ -95,9 +95,8 @@ class CallLogAnalyzer(general.AndroidComponentAnalyzer):
ContentUtils.writeToFile(abstractFile, file, context.dataSourceIngestIsCancelled)
self.__findCallLogsInDB(file.toString(), abstractFile, dataSource)
except IOException as ex:
# Error writing temporary call log db to disk.
# Catch and proceed to the next file in the loop.
pass
self._logger.log(Level.SEVERE, "Error writing temporary call log db to disk", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
except TskCoreException as ex:
# Error finding call logs.
pass
@ -163,8 +162,8 @@ class CallLogAnalyzer(general.AndroidComponentAnalyzer):
MessageNotifyUtil.Notify.error("Failed to index call log artifact for keyword search.", artifact.getDisplayName())
except TskCoreException as ex:
# Error posting call log record to the blackboard.
pass
self._logger.log(Level.SEVERE, "Error posting call log record to the blackboard", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
except SQLException as ex:
# Could not read table in db.
# Catch and proceed to the next table in the loop.

View File

@ -69,9 +69,8 @@ class ContactAnalyzer(general.AndroidComponentAnalyzer):
ContentUtils.writeToFile(abstractFile, jFile, context.dataSourceIngestIsCancelled)
self.__findContactsInDB(str(jFile.toString()), abstractFile, dataSource)
except Exception as ex:
# Error parsing Contacts.
# Catch and proceed to the next file in the loop.
pass
self._logger.log(Level.SEVERE, "Error parsing Contacts", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
except TskCoreException as ex:
# Error finding Contacts.
pass
@ -177,8 +176,8 @@ class ContactAnalyzer(general.AndroidComponentAnalyzer):
# Unable to execute contacts SQL query against database.
pass
except TskCoreException as ex:
# Error posting to blackboard.
pass
self._logger.log(Level.SEVERE, "Error posting to blackboard", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
finally:
if bbartifacts:
IngestServices.getInstance().fireModuleDataEvent(ModuleDataEvent(general.MODULE_NAME, BlackboardArtifact.ARTIFACT_TYPE.TSK_CONTACT, bbartifacts))

View File

@ -64,9 +64,8 @@ class GoogleMapLocationAnalyzer(general.AndroidComponentAnalyzer):
ContentUtils.writeToFile(abstractFile, jFile, context.dataSourceIngestIsCancelled)
self.__findGeoLocationsInDB(jFile.toString(), abstractFile)
except Exception as ex:
# Error parsing Google map locations.
# Catch and proceed to the next file in the loop.
pass
self._logger.log(Level.SEVERE, "Error parsing Google map locations", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
except TskCoreException as ex:
# Error finding Google map locations.
pass
@ -128,8 +127,8 @@ class GoogleMapLocationAnalyzer(general.AndroidComponentAnalyzer):
# Unable to execute Google map locations SQL query against database.
pass
except Exception as ex:
# Error parsing Google map locations to the blackboard.
pass
self._logger.log(Level.SEVERE, "Error parsing Google map locations to the blackboard", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
finally:
try:
if resultSet is not None:

View File

@ -65,9 +65,8 @@ class TangoMessageAnalyzer(general.AndroidComponentAnalyzer):
ContentUtils.writeToFile(abstractFile, jFile, context.dataSourceIngestIsCancelled)
self.__findTangoMessagesInDB(jFile.toString(), abstractFile, dataSource)
except Exception as ex:
# Error parsing Tango messages.
# Catch and proceed to the next file in the loop.
pass
self._logger.log(Level.SEVERE, "Error parsing Tango messages", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
except TskCoreException as ex:
# Error finding Tango messages.
pass
@ -129,8 +128,8 @@ class TangoMessageAnalyzer(general.AndroidComponentAnalyzer):
# Unable to execute Tango messages SQL query against database.
pass
except Exception as ex:
# Error parsing Tango messages to the blackboard.
pass
self._logger.log(Level.SEVERE, "Error parsing Tango messages to the blackboard", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
finally:
try:
if resultSet is not None:

View File

@ -67,9 +67,8 @@ class TextMessageAnalyzer(general.AndroidComponentAnalyzer):
ContentUtils.writeToFile(abstractFile, jFile, context.dataSourceIngestIsCancelled)
self.__findTextsInDB(jFile.toString(), abstractFile, dataSource)
except Exception as ex:
# Error parsing text messages.
# Catch and proceed to the next file in the loop.
pass
self._logger.log(Level.SEVERE, "Error parsing text messages", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
except TskCoreException as ex:
# Error finding text messages.
pass
@ -143,8 +142,8 @@ class TextMessageAnalyzer(general.AndroidComponentAnalyzer):
# Unable to execute text messages SQL query against database.
pass
except Exception as ex:
# Error parsing text messages to blackboard.
pass
self._logger.log(Level.SEVERE, "Error parsing text messages to blackboard", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
finally:
if bbartifacts:
IngestServices.getInstance().fireModuleDataEvent(ModuleDataEvent(general.MODULE_NAME, BlackboardArtifact.ARTIFACT_TYPE.TSK_MESSAGE, bbartifacts))

View File

@ -69,9 +69,8 @@ class WWFMessageAnalyzer(general.AndroidComponentAnalyzer):
ContentUtils.writeToFile(abstractFile, jFile, context.dataSourceIngestIsCancelled)
self.__findWWFMessagesInDB(jFile.toString(), abstractFile, dataSource)
except Exception as ex:
# Error parsing WWF messages.
# Catch and proceed to the next file in the loop.
pass
self._logger.log(Level.SEVERE, "Error parsing WWF messages", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
except TskCoreException as ex:
# Error finding WWF messages.
pass
@ -138,8 +137,8 @@ class WWFMessageAnalyzer(general.AndroidComponentAnalyzer):
# Unable to execute WWF messages SQL query against database.
pass
except Exception as ex:
# Error parsing WWF messages to the blackboard.
pass
self._logger.log(Level.SEVERE, "Error parsing WWF messages to the blackboard", ex)
self._logger.log(Level.SEVERE, traceback.format_exc())
finally:
try:
if resultSet is not None: