From 195818a432eff58d868754798f3545633d3dddca Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Fri, 1 Aug 2014 06:02:22 -0400 Subject: [PATCH] minor changes to logger and added a catch for throwable Former-commit-id: 0ca337442a3f60db9655c3527711ba16af3096a6 --- .../owasp/dependencycheck/utils/LogUtils.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/LogUtils.java b/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/LogUtils.java index 1841be1d7..99c5ddbb0 100644 --- a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/LogUtils.java +++ b/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/LogUtils.java @@ -53,20 +53,24 @@ public final class LogUtils { try { LogManager.getLogManager().reset(); LogManager.getLogManager().readConfiguration(in); + if (verboseLogFile != null && !verboseLogFile.isEmpty()) { verboseLoggingEnabled = true; final Logger logger = Logger.getLogger(""); - final FileHandler handler = new FileHandler(verboseLogFile, true); - handler.setFormatter(new SimpleFormatter()); - handler.setLevel(Level.FINE); - handler.setFilter(new LogFilter()); - logger.addHandler(handler); + final FileHandler fileHandler = new FileHandler(verboseLogFile, true); + fileHandler.setFormatter(new SimpleFormatter()); + fileHandler.setLevel(Level.FINE); + fileHandler.setFilter(new LogFilter()); + + logger.addHandler(fileHandler); logger.setLevel(Level.FINE); } } catch (IOException ex) { - LOGGER.log(Level.FINE, "IO Error preparing the logger", ex); + LOGGER.log(Level.WARNING, "IO Error preparing the logger", ex); } catch (SecurityException ex) { - LOGGER.log(Level.FINE, "Error preparing the logger", ex); + LOGGER.log(Level.WARNING, "Error preparing the logger", ex); + } catch (Throwable ex) { + LOGGER.log(Level.WARNING, "Error preparing the logger", ex); } finally { if (in != null) { try {