From 303a3ac376ff98a5c01d35844e38f22a1c9a82eb Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 22 Feb 2014 15:50:20 -0500 Subject: [PATCH] updated log levels when logging exceptions Former-commit-id: 343daf8cf4176d1bb810d7ecd30d56c8cdc6bf4d --- .../java/org/owasp/dependencycheck/App.java | 4 +-- .../org/owasp/dependencycheck/Engine.java | 2 +- .../analyzer/ArchiveAnalyzer.java | 2 +- .../dependencycheck/analyzer/JarAnalyzer.java | 4 +-- .../data/lucene/UrlTokenizingFilter.java | 2 +- .../data/nvdcve/ConnectionFactory.java | 29 +++++++++---------- .../dependency/EvidenceCollection.java | 2 +- .../dependencycheck/utils/FileUtils.java | 2 +- 8 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java index b2d186775..08b4ca1b3 100644 --- a/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java +++ b/dependency-check-cli/src/main/java/org/owasp/dependencycheck/App.java @@ -124,10 +124,10 @@ public class App { report.generateReports(reportDirectory, outputFormat); } catch (IOException ex) { Logger.getLogger(App.class.getName()).log(Level.SEVERE, "There was an IO error while attempting to generate the report."); - Logger.getLogger(App.class.getName()).log(Level.INFO, null, ex); + Logger.getLogger(App.class.getName()).log(Level.FINE, null, ex); } catch (Exception ex) { Logger.getLogger(App.class.getName()).log(Level.SEVERE, "There was an error while attempting to generate the report."); - Logger.getLogger(App.class.getName()).log(Level.INFO, null, ex); + Logger.getLogger(App.class.getName()).log(Level.FINE, null, ex); } } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java index 7263b2bc1..b8b4ea5b7 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java @@ -291,7 +291,7 @@ public class Engine { } catch (Exception ex) { final String msg = String.format("Exception occurred initializing %s.", a.getName()); Logger.getLogger(Engine.class.getName()).log(Level.SEVERE, msg); - Logger.getLogger(Engine.class.getName()).log(Level.INFO, null, ex); + Logger.getLogger(Engine.class.getName()).log(Level.FINE, null, ex); try { a.close(); } catch (Exception ex1) { diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java index 5c80345e7..6b9d7659e 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java @@ -263,7 +263,7 @@ public class ArchiveAnalyzer extends AbstractAnalyzer implements Analyzer { try { fis = new FileInputStream(archive); } catch (FileNotFoundException ex) { - Logger.getLogger(ArchiveAnalyzer.class.getName()).log(Level.INFO, null, ex); + Logger.getLogger(ArchiveAnalyzer.class.getName()).log(Level.FINE, null, ex); throw new AnalysisException("Archive file was not found.", ex); } final String archiveExt = org.owasp.dependencycheck.utils.FileUtils.getFileExtension(archive.getName()).toLowerCase(); diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java index 3138154ce..b2ce8affe 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java @@ -273,7 +273,7 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { final String msg = String.format("Unable to read Jar file entries in '%s'.", dependency.getActualFilePath()); final AnalysisException ax = new AnalysisException(msg, ex); Logger.getLogger(JarAnalyzer.class.getName()).log(Level.WARNING, msg); - Logger.getLogger(JarAnalyzer.class.getName()).log(Level.INFO, msg, ex); + Logger.getLogger(JarAnalyzer.class.getName()).log(Level.FINE, msg, ex); return false; } if (pomEntries.isEmpty()) { @@ -314,7 +314,7 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { } catch (AnalysisException ex) { final String msg = String.format("An error occured while analyzing '%s'.", dependency.getActualFilePath()); Logger.getLogger(JarAnalyzer.class.getName()).log(Level.WARNING, msg); - Logger.getLogger(JarAnalyzer.class.getName()).log(Level.INFO, "", ex); + Logger.getLogger(JarAnalyzer.class.getName()).log(Level.FINE, "", ex); } } return foundSomething; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.java index 03f4c0a63..e4cf05d96 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/lucene/UrlTokenizingFilter.java @@ -67,7 +67,7 @@ public final class UrlTokenizingFilter extends AbstractTokenizingFilter { final List data = UrlStringUtils.extractImportantUrlData(part); tokens.addAll(data); } catch (MalformedURLException ex) { - Logger.getLogger(UrlTokenizingFilter.class.getName()).log(Level.INFO, "error parsing " + part, ex); + Logger.getLogger(UrlTokenizingFilter.class.getName()).log(Level.FINE, "error parsing " + part, ex); tokens.add(part); } } else { diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java index 90d523803..2cca38cb3 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java @@ -103,6 +103,9 @@ public final class ConnectionFactory { throw new DatabaseException("Unable to load database driver"); } } + userName = Settings.getString(Settings.KEYS.DB_USER, "dcuser"); + //yes, yes - hard-coded password - only if there isn't one in the properties file. + password = Settings.getString(Settings.KEYS.DB_PASSWORD, "DC-Pass1337!"); try { connectionString = getConnectionString(); } catch (IOException ex) { @@ -110,10 +113,16 @@ public final class ConnectionFactory { "Unable to retrieve the database connection string", ex); throw new DatabaseException("Unable to retrieve the database connection string"); } - userName = Settings.getString(Settings.KEYS.DB_USER, "dcuser"); - //yes, yes - hard-coded password - only if there isn't one in the properties file. - password = Settings.getString(Settings.KEYS.DB_PASSWORD, "DC-Pass1337!"); - + boolean shouldCreateSchema = false; + try { + if (connectionString.startsWith("jdbc:h2:file:")) { //H2 + shouldCreateSchema = !dbSchemaExists(); + Logger.getLogger(CveDB.class.getName()).log(Level.FINE, "Need to create DB Structure: {0}", shouldCreateSchema); + } + } catch (IOException ioex) { + Logger.getLogger(ConnectionFactory.class.getName()).log(Level.FINE, "Unable to verify database exists", ioex); + throw new DatabaseException("Unable to verify database exists"); + } Logger.getLogger(CveDB.class.getName()).log(Level.FINE, "Loading database connection"); Logger.getLogger(CveDB.class.getName()).log(Level.FINE, "Connection String: {0}", connectionString); Logger.getLogger(CveDB.class.getName()).log(Level.FINE, "Database User: {0}", userName); @@ -137,17 +146,6 @@ public final class ConnectionFactory { throw new DatabaseException("Unable to connect to the database"); } - boolean shouldCreateSchema = false; - try { - if (connectionString.startsWith("jdbc:h2:file:")) { //H2 - shouldCreateSchema = !dbSchemaExists(); - Logger.getLogger(CveDB.class.getName()).log(Level.FINE, "Need to create DB Structure: {0}", shouldCreateSchema); - } - } catch (IOException ioex) { - Logger.getLogger(ConnectionFactory.class.getName()).log(Level.FINE, "Unable to verify database exists", ioex); - throw new DatabaseException("Unable to verify database exists"); - } - if (shouldCreateSchema) { try { createTables(conn); @@ -172,7 +170,6 @@ public final class ConnectionFactory { } } } - } /** diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceCollection.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceCollection.java index 354d1f59f..9c4d63ec1 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceCollection.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceCollection.java @@ -360,7 +360,7 @@ public class EvidenceCollection implements Iterable { final List data = UrlStringUtils.extractImportantUrlData(part); sb.append(' ').append(StringUtils.join(data, ' ')); } catch (MalformedURLException ex) { - Logger.getLogger(EvidenceCollection.class.getName()).log(Level.INFO, "error parsing " + part, ex); + Logger.getLogger(EvidenceCollection.class.getName()).log(Level.FINE, "error parsing " + part, ex); sb.append(' ').append(part); } } else { diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java index ff5c48f96..5ea80f944 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java @@ -160,7 +160,7 @@ public final class FileUtils { try { fis = new FileInputStream(archive); } catch (FileNotFoundException ex) { - Logger.getLogger(FileUtils.class.getName()).log(Level.INFO, null, ex); + Logger.getLogger(FileUtils.class.getName()).log(Level.FINE, null, ex); throw new ExtractionException("Archive file was not found.", ex); } zis = new ZipInputStream(new BufferedInputStream(fis));