From 902ca03de110b00959a005700f083a370def16f0 Mon Sep 17 00:00:00 2001 From: "U-BASIS\\dsmyda" Date: Mon, 23 Sep 2019 17:15:50 -0400 Subject: [PATCH] Fixed name error and rephrased error text --- InternalPythonModules/android/browserlocation.py | 4 ++-- InternalPythonModules/android/googlemaplocation.py | 4 ++-- InternalPythonModules/android/wwfmessage.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/InternalPythonModules/android/browserlocation.py b/InternalPythonModules/android/browserlocation.py index ccb0ef7f66..84c2a601e7 100644 --- a/InternalPythonModules/android/browserlocation.py +++ b/InternalPythonModules/android/browserlocation.py @@ -107,7 +107,7 @@ class BrowserLocationAnalyzer(general.AndroidComponentAnalyzer): try: # index the artifact for keyword search blackboard = Case.getCurrentCase().getSleuthkitCase().getBlackboard() - blackboard.postArtifact(artifact, MODULE_NAME) + blackboard.postArtifact(artifact, general.MODULE_NAME) except Blackboard.BlackboardException as ex: self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + str(artifact.getArtifactTypeName()), ex) self._logger.log(Level.SEVERE, traceback.format_exc()) @@ -117,7 +117,7 @@ class BrowserLocationAnalyzer(general.AndroidComponentAnalyzer): # Unable to execute browser location SQL query against database. pass except Exception as ex: - self._logger.log(Level.SEVERE, "Error putting artifacts to blackboard", ex) + self._logger.log(Level.SEVERE, "Error processing browser location history.", ex) self._logger.log(Level.SEVERE, traceback.format_exc()) finally: try: diff --git a/InternalPythonModules/android/googlemaplocation.py b/InternalPythonModules/android/googlemaplocation.py index 7e2bb75d3e..d17162fb65 100644 --- a/InternalPythonModules/android/googlemaplocation.py +++ b/InternalPythonModules/android/googlemaplocation.py @@ -117,7 +117,7 @@ class GoogleMapLocationAnalyzer(general.AndroidComponentAnalyzer): try: # index the artifact for keyword search blackboard = Case.getCurrentCase().getSleuthkitCase().getBlackboard() - blackboard.postArtifact(artifact, MODULE_NAME) + blackboard.postArtifact(artifact, general.MODULE_NAME) except Blackboard.BlackboardException as ex: self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + str(artifact.getArtifactID()), ex) self._logger.log(Level.SEVERE, traceback.format_exc()) @@ -127,7 +127,7 @@ class GoogleMapLocationAnalyzer(general.AndroidComponentAnalyzer): # Unable to execute Google map locations SQL query against database. pass except Exception as ex: - self._logger.log(Level.SEVERE, "Error parsing Google map locations to the blackboard", ex) + self._logger.log(Level.SEVERE, "Error processing google maps history.", ex) self._logger.log(Level.SEVERE, traceback.format_exc()) finally: try: diff --git a/InternalPythonModules/android/wwfmessage.py b/InternalPythonModules/android/wwfmessage.py index 33a23afaf3..9a63398181 100644 --- a/InternalPythonModules/android/wwfmessage.py +++ b/InternalPythonModules/android/wwfmessage.py @@ -135,7 +135,7 @@ class WWFMessageAnalyzer(general.AndroidComponentAnalyzer): try: # index the artifact for keyword search blackboard = Case.getCurrentCase().getSleuthkitCase().getBlackboard() - blackboard.postArtifact(artifact, MODULE_NAME) + blackboard.postArtifact(artifact, general.MODULE_NAME) except Blackboard.BlackboardException as ex: self._logger.log(Level.SEVERE, "Unable to index blackboard artifact " + str(artifact.getArtifactID()), ex) self._logger.log(Level.SEVERE, traceback.format_exc()) @@ -145,7 +145,7 @@ class WWFMessageAnalyzer(general.AndroidComponentAnalyzer): # Unable to execute WWF messages SQL query against database. pass except Exception as ex: - self._logger.log(Level.SEVERE, "Error parsing WWF messages to the blackboard", ex) + self._logger.log(Level.SEVERE, "Error parsing messages from Words With Friends.", ex) self._logger.log(Level.SEVERE, traceback.format_exc()) finally: