Merge pull request #4657 from eugene7646/fix_typo_4830

Log fixes (4656)
This commit is contained in:
Richard Cordovano 2019-03-26 16:13:36 -04:00 committed by GitHub
commit 989e70d7fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions

View File

@ -149,7 +149,7 @@ public class CommandLineIngestManager {
// read options panel configuration // read options panel configuration
String rootOutputDir = UserPreferences.getCommandLineModeResultsFolder(); String rootOutputDir = UserPreferences.getCommandLineModeResultsFolder();
LOGGER.log(Level.INFO, "Output directory = {0}", rootOutputDir); //NON-NLS LOGGER.log(Level.INFO, "Output directory = {0}", rootOutputDir); //NON-NLS
System.out.println("Output directoryh = " + rootOutputDir); System.out.println("Output directory = " + rootOutputDir);
if (rootOutputDir.isEmpty()) { if (rootOutputDir.isEmpty()) {
LOGGER.log(Level.SEVERE, "Output directory not specified, please configure Command Line Options Panel (in Tools -> Options)"); LOGGER.log(Level.SEVERE, "Output directory not specified, please configure Command Line Options Panel (in Tools -> Options)");

View File

@ -56,22 +56,22 @@ public class CommandLineOptionProcessor extends OptionProcessor {
@Override @Override
protected void process(Env env, Map<Option, String[]> values) throws CommandException { protected void process(Env env, Map<Option, String[]> values) throws CommandException {
logger.log(Level.INFO, "Processing Autopsy command line options"); //NON-NLS logger.log(Level.INFO, "Processing Autopsy command line options"); //NON-NLS
System.out.println("Processing Autopsy command line options using CommandLineOptionProcessor"); System.out.println("Processing Autopsy command line options");
if (values.containsKey(pathToDataSourceOption) && values.containsKey(caseNameOption) && values.containsKey(runFromCommandLineOption)) { if (values.containsKey(pathToDataSourceOption) && values.containsKey(caseNameOption) && values.containsKey(runFromCommandLineOption)) {
// parse input parameters // parse input parameters
String inputPath; String inputPath;
String inputCaseName; String inputCaseName;
String modeString; String modeString;
if (values.size() < 3) { if (values.size() < 3) {
logger.log(Level.SEVERE, "Insufficient number of input arguments. Exiting"); logger.log(Level.SEVERE, "Insufficient number of input arguments to run command line ingest");
System.out.println("Insufficient number of input arguments. Exiting"); System.out.println("Insufficient number of input arguments to run command line ingest");
this.runFromCommandLine = false; this.runFromCommandLine = false;
return; return;
} else { } else {
String[] argDirs = values.get(pathToDataSourceOption); String[] argDirs = values.get(pathToDataSourceOption);
if (argDirs.length < 1) { if (argDirs.length < 1) {
logger.log(Level.SEVERE, "Missing argument 'inputPath'. Exiting"); logger.log(Level.SEVERE, "Missing argument 'inputPath'");
System.out.println("Missing argument 'inputPath'. Exiting"); System.out.println("Missing argument 'inputPath'");
this.runFromCommandLine = false; this.runFromCommandLine = false;
return; return;
} }
@ -79,8 +79,8 @@ public class CommandLineOptionProcessor extends OptionProcessor {
argDirs = values.get(caseNameOption); argDirs = values.get(caseNameOption);
if (argDirs.length < 1) { if (argDirs.length < 1) {
logger.log(Level.SEVERE, "Missing argument 'caseName'. Exiting"); logger.log(Level.SEVERE, "Missing argument 'caseName'");
System.out.println("Missing argument 'caseName'. Exiting"); System.out.println("Missing argument 'caseName'");
this.runFromCommandLine = false; this.runFromCommandLine = false;
return; return;
} }
@ -88,8 +88,8 @@ public class CommandLineOptionProcessor extends OptionProcessor {
argDirs = values.get(runFromCommandLineOption); argDirs = values.get(runFromCommandLineOption);
if (argDirs.length < 1) { if (argDirs.length < 1) {
logger.log(Level.SEVERE, "Missing argument 'runFromCommandLine'. Exiting"); logger.log(Level.SEVERE, "Missing argument 'runFromCommandLine'");
System.out.println("Missing argument 'runFromCommandLine'. Exiting"); System.out.println("Missing argument 'runFromCommandLine'");
this.runFromCommandLine = false; this.runFromCommandLine = false;
return; return;
} }
@ -111,15 +111,15 @@ public class CommandLineOptionProcessor extends OptionProcessor {
// verify inputs // verify inputs
if (inputPath == null || inputPath.isEmpty() || !(new File(inputPath).exists())) { if (inputPath == null || inputPath.isEmpty() || !(new File(inputPath).exists())) {
logger.log(Level.SEVERE, "Input file {0} doesn''t exist. Exiting", inputPath); logger.log(Level.SEVERE, "Input file {0} doesn''t exist", inputPath);
System.out.println("Input file " + inputPath + " doesn't exist. Exiting"); System.out.println("Input file " + inputPath + " doesn't exist");
this.runFromCommandLine = false; this.runFromCommandLine = false;
return; return;
} }
if (inputCaseName == null || inputCaseName.isEmpty()) { if (inputCaseName == null || inputCaseName.isEmpty()) {
logger.log(Level.SEVERE, "Case name argument is empty. Exiting"); logger.log(Level.SEVERE, "Case name argument is empty");
System.out.println("Case name argument is empty. Exiting"); System.out.println("Case name argument is empty");
this.runFromCommandLine = false; this.runFromCommandLine = false;
return; return;
} }
@ -134,8 +134,8 @@ public class CommandLineOptionProcessor extends OptionProcessor {
System.out.println("Case name = " + this.baseCaseName); System.out.println("Case name = " + this.baseCaseName);
System.out.println("runFromCommandLine = " + this.runFromCommandLine); System.out.println("runFromCommandLine = " + this.runFromCommandLine);
} else { } else {
System.out.println("Missing input arguments for CommandLineOptionProcessor. Exiting"); System.out.println("Missing input arguments to run command line ingest");
logger.log(Level.SEVERE, "Missing input arguments. Exiting"); logger.log(Level.SEVERE, "Missing input arguments to run command line ingest");
} }
} }