From 4558b49c1bf29da2c4295308b468135b6476f478 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 15 Jun 2013 23:42:45 -0400 Subject: [PATCH] updated logging Former-commit-id: 4d6b0268527200b6472c2068c2e835ae003a9f44 --- .../java/org/owasp/dependencycheck/App.java | 24 +++++++------- .../org/owasp/dependencycheck/Engine.java | 23 +++++++------ .../analyzer/FalsePositiveAnalyzer.java | 2 +- .../dependencycheck/analyzer/JarAnalyzer.java | 15 +++++---- .../owasp/dependencycheck/data/cpe/Entry.java | 2 +- .../owasp/dependencycheck/data/cwe/CweDB.java | 8 +++-- .../data/lucene/AbstractIndex.java | 20 +++++++++--- .../data/nvdcve/xml/DatabaseUpdater.java | 32 ++++++++----------- .../data/nvdcve/xml/NvdCve20Handler.java | 3 +- .../dependency/Dependency.java | 8 +++-- .../dependency/VulnerableSoftware.java | 4 ++- .../owasp/dependencycheck/utils/Checksum.java | 2 +- .../owasp/dependencycheck/utils/Settings.java | 6 ++-- 13 files changed, 85 insertions(+), 64 deletions(-) diff --git a/src/main/java/org/owasp/dependencycheck/App.java b/src/main/java/org/owasp/dependencycheck/App.java index c9efc8f58..96031eaca 100644 --- a/src/main/java/org/owasp/dependencycheck/App.java +++ b/src/main/java/org/owasp/dependencycheck/App.java @@ -81,16 +81,16 @@ public class App { LogManager.getLogManager().reset(); LogManager.getLogManager().readConfiguration(in); } catch (IOException ex) { - System.err.println(ex.toString()); - Logger.getLogger(App.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(App.class.getName()).log(Level.FINE, "IO Error preparing the logger", ex); } catch (SecurityException ex) { - Logger.getLogger(App.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(App.class.getName()).log(Level.FINE, "Error preparing the logger", ex); } finally { - try { - in.close(); - } catch (Exception ex) { - //ignore - in = null; + if (in != null) { + try { + in.close(); + } catch (Exception ex) { + Logger.getLogger(App.class.getName()).log(Level.FINEST, null, ex); + } } } } @@ -108,12 +108,10 @@ public class App { } catch (FileNotFoundException ex) { System.err.println(ex.getMessage()); cli.printHelp(); - Logger.getLogger(App.class.getName()).log(Level.WARNING, null, ex); return; } catch (ParseException ex) { System.err.println(ex.getMessage()); cli.printHelp(); - Logger.getLogger(App.class.getName()).log(Level.INFO, null, ex); return; } @@ -151,9 +149,11 @@ public class App { try { report.generateReports(reportDirectory, outputFormat); } catch (IOException ex) { - Logger.getLogger(App.class.getName()).log(Level.SEVERE, null, 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); } catch (Exception ex) { - Logger.getLogger(App.class.getName()).log(Level.SEVERE, null, 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); } } diff --git a/src/main/java/org/owasp/dependencycheck/Engine.java b/src/main/java/org/owasp/dependencycheck/Engine.java index c6dc9e597..ddfaf2908 100644 --- a/src/main/java/org/owasp/dependencycheck/Engine.java +++ b/src/main/java/org/owasp/dependencycheck/Engine.java @@ -71,7 +71,7 @@ public class Engine { try { autoUpdate = Settings.getBoolean(Settings.KEYS.AUTO_UPDATE); } catch (InvalidSettingException ex) { - Logger.getLogger(Engine.class.getName()).log(Level.WARNING, "Invalid setting for auto-update."); + Logger.getLogger(Engine.class.getName()).log(Level.FINE, "Invalid setting for auto-update; using true."); } if (autoUpdate) { doUpdates(); @@ -192,8 +192,9 @@ public class Engine { */ protected void scanFile(File file) { if (!file.isFile()) { - final String msg = String.format("Path passed to scanFile(File) is not a file: %s.", file.toString()); - Logger.getLogger(Engine.class.getName()).log(Level.WARNING, msg); + final String msg = String.format("Path passed to scanFile(File) is not a file: %s. Skipping the file.", file.toString()); + Logger.getLogger(Engine.class.getName()).log(Level.FINE, msg); + return; } final String fileName = file.getName(); final String extension = FileUtils.getFileExtension(fileName); @@ -220,12 +221,13 @@ public class Engine { try { a.initialize(); } catch (Exception ex) { - Logger.getLogger(Engine.class.getName()).log(Level.SEVERE, - "Exception occurred initializing " + a.getName() + ".", 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, msg, ex); try { a.close(); } catch (Exception ex1) { - Logger.getLogger(Engine.class.getName()).log(Level.FINER, null, ex1); + Logger.getLogger(Engine.class.getName()).log(Level.FINEST, null, ex1); } } } @@ -261,7 +263,7 @@ public class Engine { try { a.close(); } catch (Exception ex) { - Logger.getLogger(Engine.class.getName()).log(Level.WARNING, null, ex); + Logger.getLogger(Engine.class.getName()).log(Level.FINEST, null, ex); } } } @@ -280,9 +282,10 @@ public class Engine { } catch (UpdateException ex) { Logger.getLogger(Engine.class.getName()).log(Level.WARNING, "Unable to update Cached Web DataSource, using local data instead. Results may not include recent vulnerabilities."); - Logger.getLogger(Engine.class.getName()).log(Level.INFO, - String.format("Unable to update details for %s", - source.getClass().getName()), ex); + Logger.getLogger(Engine.class.getName()).log(Level.FINE, + String.format("Unable to update Cached Web DataSource, using local data instead. Results may not include recent " + + "vulnerabilities. Unable to update details for %s", + source.getClass().getName()), ex); } } } diff --git a/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java b/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java index 9dfebbe78..3add50fd4 100644 --- a/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java +++ b/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java @@ -105,7 +105,7 @@ public class FalsePositiveAnalyzer extends AbstractAnalyzer { try { deepScan = Settings.getBoolean(Settings.KEYS.PERFORM_DEEP_SCAN); } catch (InvalidSettingException ex) { - Logger.getLogger(FalsePositiveAnalyzer.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(FalsePositiveAnalyzer.class.getName()).log(Level.INFO, "deepscan setting is incorrect; expected a boolean.", ex); } if (!deepScan) { removeSpuriousCPE(dependency); diff --git a/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java b/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java index 7b7c2f97d..4a4727a22 100644 --- a/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java +++ b/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java @@ -239,17 +239,19 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { final String msg = String.format("Unable to read JarFile '%s'.", dependency.getActualFilePath()); final AnalysisException ax = new AnalysisException(msg, ex); dependency.getAnalysisExceptions().add(ax); - Logger.getLogger(JarAnalyzer.class.getName()).log(Level.WARNING, msg, ex); + Logger.getLogger(JarAnalyzer.class.getName()).log(Level.WARNING, msg); + Logger.getLogger(JarAnalyzer.class.getName()).log(Level.INFO, msg, ex); return foundSomething; } List pomEntries; try { pomEntries = retrievePomListing(jar); } catch (IOException ex) { - final String msg = String.format("Unable to read JarEntries in '%s'.", dependency.getActualFilePath()); + final String msg = String.format("Unable to read Jar file entries in '%s'.", dependency.getActualFilePath()); final AnalysisException ax = new AnalysisException(msg, ex); dependency.getAnalysisExceptions().add(ax); - Logger.getLogger(JarAnalyzer.class.getName()).log(Level.WARNING, msg, ex); + Logger.getLogger(JarAnalyzer.class.getName()).log(Level.WARNING, msg); + Logger.getLogger(JarAnalyzer.class.getName()).log(Level.INFO, msg, ex); return foundSomething; } @@ -268,10 +270,11 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { path, dependency.getFilePath()); final AnalysisException ax = new AnalysisException(msg, ex); dependency.getAnalysisExceptions().add(ax); - Logger.getLogger(JarAnalyzer.class.getName()).log(Level.WARNING, msg); - Logger.getLogger(JarAnalyzer.class.getName()).log(Level.SEVERE, msg, ax); + Logger.getLogger(JarAnalyzer.class.getName()).log(Level.INFO, msg, ax); } catch (IOException ex) { - Logger.getLogger(JarAnalyzer.class.getName()).log(Level.SEVERE, null, ex); + final String msg = String.format("Unable to retrieve POM '%s' in '%s'", + path, dependency.getFilePath()); + Logger.getLogger(JarAnalyzer.class.getName()).log(Level.INFO, msg, ex); } foundSomething = setPomEvidence(dependency, pom, pomProperties) || foundSomething; } diff --git a/src/main/java/org/owasp/dependencycheck/data/cpe/Entry.java b/src/main/java/org/owasp/dependencycheck/data/cpe/Entry.java index 06e749148..c053b9cac 100644 --- a/src/main/java/org/owasp/dependencycheck/data/cpe/Entry.java +++ b/src/main/java/org/owasp/dependencycheck/data/cpe/Entry.java @@ -49,7 +49,7 @@ public class Entry implements Serializable { try { entry.parseName(doc.get(Fields.NAME)); } catch (UnsupportedEncodingException ex) { - Logger.getLogger(Entry.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(Entry.class.getName()).log(Level.FINE, null, ex); entry.name = doc.get(Fields.NAME); } return entry; diff --git a/src/main/java/org/owasp/dependencycheck/data/cwe/CweDB.java b/src/main/java/org/owasp/dependencycheck/data/cwe/CweDB.java index 9ed68fa3a..a923be30d 100644 --- a/src/main/java/org/owasp/dependencycheck/data/cwe/CweDB.java +++ b/src/main/java/org/owasp/dependencycheck/data/cwe/CweDB.java @@ -55,15 +55,17 @@ public final class CweDB { oin = new ObjectInputStream(input); return (HashMap) oin.readObject(); } catch (ClassNotFoundException ex) { - Logger.getLogger(CweDB.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(CweDB.class.getName()).log(Level.WARNING, "Unable to load CWE data. This should not be an issue."); + Logger.getLogger(CweDB.class.getName()).log(Level.FINE, null, ex); } catch (IOException ex) { - Logger.getLogger(CweDB.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(CweDB.class.getName()).log(Level.WARNING, "Unable to load CWE data due to an IO Error. This should not be an issue."); + Logger.getLogger(CweDB.class.getName()).log(Level.FINE, null, ex); } finally { if (oin != null) { try { oin.close(); } catch (IOException ex) { - Logger.getLogger(CweDB.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(CweDB.class.getName()).log(Level.FINEST, null, ex); } } } diff --git a/src/main/java/org/owasp/dependencycheck/data/lucene/AbstractIndex.java b/src/main/java/org/owasp/dependencycheck/data/lucene/AbstractIndex.java index 03857d042..a1e011ccd 100644 --- a/src/main/java/org/owasp/dependencycheck/data/lucene/AbstractIndex.java +++ b/src/main/java/org/owasp/dependencycheck/data/lucene/AbstractIndex.java @@ -98,16 +98,24 @@ public abstract class AbstractIndex { try { indexWriter.commit(); } catch (CorruptIndexException ex) { - Logger.getLogger(AbstractIndex.class.getName()).log(Level.SEVERE, null, ex); + final String msg = "Unable to update database, there is a corrupt index."; + Logger.getLogger(AbstractIndex.class.getName()).log(Level.SEVERE, msg); + Logger.getLogger(AbstractIndex.class.getName()).log(Level.FINE, msg, ex); } catch (IOException ex) { - Logger.getLogger(AbstractIndex.class.getName()).log(Level.SEVERE, null, ex); + final String msg = "Unable to update database due to an IO error."; + Logger.getLogger(AbstractIndex.class.getName()).log(Level.SEVERE, msg); + Logger.getLogger(AbstractIndex.class.getName()).log(Level.FINE, msg, ex); } try { indexWriter.close(true); } catch (CorruptIndexException ex) { - Logger.getLogger(AbstractIndex.class.getName()).log(Level.SEVERE, null, ex); + final String msg = "Unable to update database, there is a corrupt index."; + Logger.getLogger(AbstractIndex.class.getName()).log(Level.SEVERE, msg); + Logger.getLogger(AbstractIndex.class.getName()).log(Level.FINE, msg, ex); } catch (IOException ex) { - Logger.getLogger(AbstractIndex.class.getName()).log(Level.SEVERE, null, ex); + final String msg = "Unable to update database due to an IO error."; + Logger.getLogger(AbstractIndex.class.getName()).log(Level.SEVERE, msg); + Logger.getLogger(AbstractIndex.class.getName()).log(Level.FINE, msg, ex); } finally { indexWriter = null; } @@ -129,7 +137,9 @@ public abstract class AbstractIndex { try { directory.close(); } catch (IOException ex) { - Logger.getLogger(AbstractIndex.class.getName()).log(Level.SEVERE, null, ex); + final String msg = "Unable to update database due to an IO error."; + Logger.getLogger(AbstractIndex.class.getName()).log(Level.SEVERE, msg); + Logger.getLogger(AbstractIndex.class.getName()).log(Level.FINE, msg, ex); } finally { directory = null; } diff --git a/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdater.java b/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdater.java index b6b0865fb..ffdbbc488 100644 --- a/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdater.java +++ b/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/DatabaseUpdater.java @@ -96,20 +96,20 @@ public class DatabaseUpdater implements CachedWebDataSource { } } if (maxUpdates > 3) { - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.WARNING, + Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.INFO, "NVD CVE requires several updates; this could take a couple of minutes."); } int count = 0; for (NvdCveUrl cve : update.values()) { if (cve.getNeedsUpdate()) { count += 1; - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.WARNING, + Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.INFO, "Updating NVD CVE ({0} of {1})", new Object[]{count, maxUpdates}); URL url = new URL(cve.getUrl()); File outputPath = null; File outputPath12 = null; try { - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.WARNING, + Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.INFO, "Downloading {0}", cve.getUrl()); outputPath = File.createTempFile("cve" + cve.getId() + "_", ".xml"); @@ -119,11 +119,11 @@ public class DatabaseUpdater implements CachedWebDataSource { outputPath12 = File.createTempFile("cve_1_2_" + cve.getId() + "_", ".xml"); Downloader.fetchFile(url, outputPath12, false); - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.WARNING, + Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.INFO, "Processing {0}", cve.getUrl()); importXML(outputPath, outputPath12); - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.WARNING, + Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.INFO, "Completed updated {0} of {1}", new Object[]{count, maxUpdates}); } catch (FileNotFoundException ex) { throw new UpdateException(ex); @@ -210,12 +210,6 @@ public class DatabaseUpdater implements CachedWebDataSource { cve20Handler.setPrevVersionVulnMap(prevVersionVulnMap); cve20Handler.setCpeIndex(cpeIndex); saxParser.parse(file, cve20Handler); - -// Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.WARNING, -// String.format("%d out of %d entries processed were application specific CVEs.", -// cve20Handler.getTotalNumberOfApplicationEntries(), -// cve20Handler.getTotalNumberOfEntries())); - cve20Handler = null; } finally { if (cpeIndex != null) { @@ -242,7 +236,7 @@ public class DatabaseUpdater implements CachedWebDataSource { try { dir = CveDB.getDataDirectory().getCanonicalPath(); } catch (IOException ex) { - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.FINE, "Error updating the databases propterty file.", ex); throw new UpdateException("Unable to locate last updated properties file.", ex); } final File cveProp = new File(dir + File.separatorChar + UPDATE_PROPERTIES_FILE); @@ -259,10 +253,10 @@ public class DatabaseUpdater implements CachedWebDataSource { out = new OutputStreamWriter(os, "UTF-8"); prop.store(out, dir); } catch (FileNotFoundException ex) { - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.FINE, null, ex); throw new UpdateException("Unable to find last updated properties file.", ex); } catch (IOException ex) { - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.FINE, null, ex); throw new UpdateException("Unable to update last updated properties file.", ex); } finally { if (out != null) { @@ -302,11 +296,11 @@ public class DatabaseUpdater implements CachedWebDataSource { try { currentlyPublished = retrieveCurrentTimestampsFromWeb(); } catch (InvalidDataException ex) { - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.SEVERE, null, ex); + //Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.SEVERE, null, ex); throw new DownloadFailedException("Unable to retrieve valid timestamp from nvd cve downloads page", ex); } catch (InvalidSettingException ex) { - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.SEVERE, null, ex); + ///Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.SEVERE, null, ex); throw new DownloadFailedException("Invalid settings", ex); } @@ -317,7 +311,7 @@ public class DatabaseUpdater implements CachedWebDataSource { try { dir = CveDB.getDataDirectory().getCanonicalPath(); } catch (IOException ex) { - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.SEVERE, null, ex); + //Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.SEVERE, null, ex); throw new UpdateException("Unable to locate last updated properties file.", ex); } @@ -348,7 +342,7 @@ public class DatabaseUpdater implements CachedWebDataSource { } } if (deleteAndRecreate) { - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.WARNING, "Index version is old. Rebuilding the index."); + Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.INFO, "The database version is old. Rebuilding the database."); is.close(); //this is an old version of the lucene index - just delete it FileUtils.delete(f); @@ -398,7 +392,7 @@ public class DatabaseUpdater implements CachedWebDataSource { try { is.close(); } catch (IOException ex) { - Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(DatabaseUpdater.class.getName()).log(Level.FINEST, null, ex); } } } diff --git a/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve20Handler.java b/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve20Handler.java index b3672cfe3..315575579 100644 --- a/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve20Handler.java +++ b/src/main/java/org/owasp/dependencycheck/data/nvdcve/xml/NvdCve20Handler.java @@ -172,7 +172,8 @@ public class NvdCve20Handler extends DefaultHandler { final float score = Float.parseFloat(nodeText.toString()); vulnerability.setCvssScore(score); } catch (NumberFormatException ex) { - Logger.getLogger(NvdCve20Handler.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(NvdCve20Handler.class.getName()).log(Level.SEVERE, "Error parsing CVSS Score."); + Logger.getLogger(NvdCve20Handler.class.getName()).log(Level.FINE, "Error parsing CVSS Score.", ex); } nodeText = null; } else if (current.isCVSSAccessVectorNode()) { diff --git a/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java b/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java index a2a5ed8bb..17f883d0c 100644 --- a/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java +++ b/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java @@ -427,9 +427,13 @@ public class Dependency implements Comparable { md5 = Checksum.getMD5Checksum(file); sha1 = Checksum.getSHA1Checksum(file); } catch (IOException ex) { - Logger.getLogger(Dependency.class.getName()).log(Level.SEVERE, null, ex); + final String msg = String.format("Unable to read '%s' to determine hashes.", file.getName()); + Logger.getLogger(Dependency.class.getName()).log(Level.WARNING, msg); + Logger.getLogger(Dependency.class.getName()).log(Level.FINE, msg, ex); } catch (NoSuchAlgorithmException ex) { - Logger.getLogger(Dependency.class.getName()).log(Level.SEVERE, null, ex); + final String msg = "Unable to use MD5 of SHA1 checksums."; + Logger.getLogger(Dependency.class.getName()).log(Level.WARNING, msg); + Logger.getLogger(Dependency.class.getName()).log(Level.FINE, msg, ex); } this.setMd5sum(md5); this.setSha1sum(sha1); diff --git a/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java b/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java index 99aa97b56..6dcaff037 100644 --- a/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java +++ b/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java @@ -46,7 +46,9 @@ public class VulnerableSoftware extends Entry implements Serializable, Comparabl try { parseName(cpe); } catch (UnsupportedEncodingException ex) { - Logger.getLogger(VulnerableSoftware.class.getName()).log(Level.SEVERE, null, ex); + final String msg = String.format("Character encoding is unsupported for CPE '%s'.", cpe); + Logger.getLogger(VulnerableSoftware.class.getName()).log(Level.WARNING, msg); + Logger.getLogger(VulnerableSoftware.class.getName()).log(Level.FINE, msg, ex); setName(cpe); } } diff --git a/src/main/java/org/owasp/dependencycheck/utils/Checksum.java b/src/main/java/org/owasp/dependencycheck/utils/Checksum.java index d9b4db43a..9c5084f8d 100644 --- a/src/main/java/org/owasp/dependencycheck/utils/Checksum.java +++ b/src/main/java/org/owasp/dependencycheck/utils/Checksum.java @@ -51,7 +51,7 @@ public class Checksum { try { fis.close(); } catch (IOException ex) { - Logger.getLogger(Checksum.class.getName()).log(Level.SEVERE, null, ex); + Logger.getLogger(Checksum.class.getName()).log(Level.FINEST, "Error closing file '" + file.getName() + "'.", ex); } } } diff --git a/src/main/java/org/owasp/dependencycheck/utils/Settings.java b/src/main/java/org/owasp/dependencycheck/utils/Settings.java index 563272e69..c16507915 100644 --- a/src/main/java/org/owasp/dependencycheck/utils/Settings.java +++ b/src/main/java/org/owasp/dependencycheck/utils/Settings.java @@ -155,7 +155,8 @@ public final class Settings { try { props.load(in); } catch (IOException ex) { - Logger.getLogger(Settings.class.getName()).log(Level.SEVERE, "Unable to load default settings.", ex); + Logger.getLogger(Settings.class.getName()).log(Level.SEVERE, "Unable to load default settings."); + Logger.getLogger(Settings.class.getName()).log(Level.FINE, "Unable to load default settings.", ex); } } @@ -280,7 +281,8 @@ public final class Settings { try { value = Integer.parseInt(Settings.getString(key)); } catch (NumberFormatException ex) { - Logger.getLogger(Settings.class.getName()).log(Level.FINEST, "Could not convert property '" + key + "' to an int.", ex); + final String msg = String.format("Could not convert property '%s' to an int.", key); + Logger.getLogger(Settings.class.getName()).log(Level.FINEST, msg, ex); value = defaultValue; } return value;