mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-19 11:07:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

reverted externalized log messages

Browse Source
This commit is contained in:
sidheshenator 2015-07-31 13:33:33 -04:00
parent 4c0a230fd6
commit 42f96c2467
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/org/sleuthkit/autopsy/modules/photoreccarver/Bundle.properties
View File

@ -22,7 +22,4 @@ PhotoRecIngestModule.NotEnoughDiskSpace.detail.msg=PhotoRec error processing {0}
PhotoRecIngestModule.cancelledByUser=PhotoRec cancelled by user. PhotoRecIngestModule.cancelledByUser=PhotoRec cancelled by user.
PhotoRecIngestModule.error.exitValue=PhotoRec carver returned error exit value = {0} when scanning {1} PhotoRecIngestModule.error.exitValue=PhotoRec carver returned error exit value = {0} when scanning {1}
PhotoRecIngestModule.error.msg=Error processing {0} with PhotoRec carver. PhotoRecIngestModule.error.msg=Error processing {0} with PhotoRec carver.
PhotoRecIngestModule.shutdown.error=Error shutting down PhotoRec carver module.
PhotoRecIngestModule.parentAbstractFile.error=PhotoRec carver exception while trying to get parent of AbstractFile.
PhotoRecIngestModule.failedStartup=PhotoRec carver called after failed start up.
PhotoRecIngestModule.complete.numberOfErrors=Number of Errors while Carving\: PhotoRecIngestModule.complete.numberOfErrors=Number of Errors while Carving\:

17
Core/src/org/sleuthkit/autopsy/modules/photoreccarver/PhotoRecCarverFileIngestModule.java
View File

@ -175,7 +175,7 @@ final class PhotoRecCarverFileIngestModule implements FileIngestModule {
// Verify initialization succeeded. // Verify initialization succeeded.
if (null == this.executableFile) { if (null == this.executableFile) {
logger.log(Level.SEVERE, NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.failedStartup")); logger.log(Level.SEVERE, "PhotoRec carver called after failed start up"); // NON-NLS
return IngestModule.ProcessResult.ERROR; return IngestModule.ProcessResult.ERROR;
} }
@ -186,7 +186,8 @@ final class PhotoRecCarverFileIngestModule implements FileIngestModule {
if ((freeDiskSpace != -1) && ((file.getSize() * 1.2) > freeDiskSpace)) { if ((freeDiskSpace != -1) && ((file.getSize() * 1.2) > freeDiskSpace)) {
totals.totalItemsWithErrors.incrementAndGet(); totals.totalItemsWithErrors.incrementAndGet();
logger.log(Level.SEVERE, NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.NotEnoughDiskSpace.detail.msg", new Object[]{file.getName(), PhotoRecCarverIngestModuleFactory.getModuleName()})); logger.log(Level.SEVERE, "PhotoRec error processing {0} with {1} Not enough space on primary disk to save unallocated space.", // NON-NLS
new Object[]{file.getName(), PhotoRecCarverIngestModuleFactory.getModuleName()}); // NON-NLS
MessageNotifyUtil.Notify.error(NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.UnableToCarve", file.getName()), MessageNotifyUtil.Notify.error(NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.UnableToCarve", file.getName()),
NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.NotEnoughDiskSpace")); NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.NotEnoughDiskSpace"));
@ -223,15 +224,15 @@ final class PhotoRecCarverFileIngestModule implements FileIngestModule {
if (this.context.fileIngestIsCancelled() == true) { if (this.context.fileIngestIsCancelled() == true) {
// if it was cancelled by the user, result is OK // if it was cancelled by the user, result is OK
cleanup(outputDirPath, tempFilePath); cleanup(outputDirPath, tempFilePath);
logger.log(Level.INFO, NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.cancelledByUser")); logger.log(Level.INFO, "PhotoRec cancelled by user"); // NON-NLS
MessageNotifyUtil.Notify.info(PhotoRecCarverIngestModuleFactory.getModuleName(), NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.cancelledByUser")); MessageNotifyUtil.Notify.info(PhotoRecCarverIngestModuleFactory.getModuleName(), NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.cancelledByUser"));
return IngestModule.ProcessResult.OK; return IngestModule.ProcessResult.OK;
} else if (0 != exitValue) { } else if (0 != exitValue) {
// if it failed or was cancelled by timeout, result is ERROR // if it failed or was cancelled by timeout, result is ERROR
cleanup(outputDirPath, tempFilePath); cleanup(outputDirPath, tempFilePath);
totals.totalItemsWithErrors.incrementAndGet(); totals.totalItemsWithErrors.incrementAndGet();
logger.log(Level.SEVERE, NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.error.exitValue", logger.log(Level.SEVERE, "PhotoRec carver returned error exit value = {0} when scanning {1}", // NON-NLS
new Object[]{exitValue, file.getName()})); new Object[]{exitValue, file.getName()}); // NON-NLS
MessageNotifyUtil.Notify.error(PhotoRecCarverIngestModuleFactory.getModuleName(), NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.error.exitValue", // NON-NLS MessageNotifyUtil.Notify.error(PhotoRecCarverIngestModuleFactory.getModuleName(), NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.error.exitValue", // NON-NLS
new Object[]{exitValue, file.getName()})); new Object[]{exitValue, file.getName()}));
return IngestModule.ProcessResult.ERROR; return IngestModule.ProcessResult.ERROR;
@ -266,7 +267,7 @@ final class PhotoRecCarverFileIngestModule implements FileIngestModule {
} }
} catch (IOException ex) { } catch (IOException ex) {
totals.totalItemsWithErrors.incrementAndGet(); totals.totalItemsWithErrors.incrementAndGet();
logger.log(Level.SEVERE, NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.error.msg", file.getName()), ex); logger.log(Level.SEVERE, "Error processing " + file.getName() + " with PhotoRec carver", ex); // NON-NLS
MessageNotifyUtil.Notify.error(PhotoRecCarverIngestModuleFactory.getModuleName(), NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.error.msg", file.getName())); MessageNotifyUtil.Notify.error(PhotoRecCarverIngestModuleFactory.getModuleName(), NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.error.msg", file.getName()));
return IngestModule.ProcessResult.ERROR; return IngestModule.ProcessResult.ERROR;
} finally { } finally {
@ -334,7 +335,7 @@ final class PhotoRecCarverFileIngestModule implements FileIngestModule {
FileUtil.deleteDir(new File(paths.getTempDirPath().toString())); FileUtil.deleteDir(new File(paths.getTempDirPath().toString()));
postSummary(jobId); postSummary(jobId);
} catch (SecurityException ex) { } catch (SecurityException ex) {
logger.log(Level.SEVERE, NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.shutdown.error"), ex); logger.log(Level.SEVERE, "Error shutting down PhotoRec carver module", ex); // NON-NLS
} }
} }
} }
@ -396,7 +397,7 @@ final class PhotoRecCarverFileIngestModule implements FileIngestModule {
parent = parent.getParent(); parent = parent.getParent();
} }
} catch (TskCoreException ex) { } catch (TskCoreException ex) {
logger.log(Level.SEVERE, NbBundle.getMessage(PhotoRecCarverFileIngestModule.class, "PhotoRecIngestModule.parentAbstractFile.error"), ex); logger.log(Level.SEVERE, "PhotoRec carver exception while trying to get parent of AbstractFile.", ex); //NON-NLS
} }
return id; return id;
} }