diff --git a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/LogFilter.java b/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/LogFilter.java deleted file mode 100644 index cf0e6b386..000000000 --- a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/LogFilter.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * This file is part of dependency-check-core. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Copyright (c) 2013 Jeremy Long. All Rights Reserved. - */ -package org.owasp.dependencycheck.utils; - -import java.util.logging.Filter; -import java.util.logging.LogRecord; - -/** - * A simple log filter to limit the entries written to the verbose log file. The verbose log file uses the root logger - * as I couldn't get anything else to work; as such, this filter limits the log entries to specific classes. - * - * @author Jeremy Long - */ -public class LogFilter implements Filter { - - /** - * Determines if the record should be logged. - * - * @param record a log record to examine - * @return true if the record should be logged, otherwise false - */ - @Override - public boolean isLoggable(LogRecord record) { - final String name = record.getSourceClassName(); - return name.startsWith("org.owasp.dependencycheck") && !name.contains("generated") && !name.contains("VelocityLoggerRedirect"); - } -} 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 deleted file mode 100644 index dfc4888f5..000000000 --- a/dependency-check-utils/src/main/java/org/owasp/dependencycheck/utils/LogUtils.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * This file is part of dependency-check-core. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Copyright (c) 2013 Jeremy Long. All Rights Reserved. - */ -package org.owasp.dependencycheck.utils; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.logging.FileHandler; -import java.util.logging.Level; -import java.util.logging.LogManager; -import java.util.logging.Logger; -import java.util.logging.SimpleFormatter; - -/** - * A utility class to aide in the setup of the logging mechanism. - * - * @author Jeremy Long - */ -public final class LogUtils { - - /** - * The logger. - */ - private static final Logger LOGGER = Logger.getLogger(LogUtils.class.getName()); - - /** - * Private constructor for a utility class. - */ - private LogUtils() { - } - - /** - * Configures the logger for use by the application. - * - * @param in the input stream to read the log settings from - * @param verboseLogFile the file path for the verbose log - */ - public static void prepareLogger(InputStream in, String verboseLogFile) { - try { - LogManager.getLogManager().reset(); - LogManager.getLogManager().readConfiguration(in); - - if (verboseLogFile != null && !verboseLogFile.isEmpty()) { - verboseLoggingEnabled = true; - final Logger logger = Logger.getLogger(""); - final File logFile = new File(verboseLogFile); - final File logDir = logFile.getParentFile(); - if (logDir != null && !logDir.isDirectory() && !logDir.mkdirs()) { - final String msg = String.format("Unable to create directory '%s', verbose logging will be disabled.", - logDir.getAbsolutePath()); - throw new IOException(msg); - } - 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.WARNING, "IO Error preparing the logger", ex); - } catch (SecurityException 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 { - in.close(); - } catch (IOException ex) { - LOGGER.log(Level.FINEST, "Error closing resource stream", ex); - } - } - } - } - /** - * Whether or not verbose logging is enabled. - */ - private static boolean verboseLoggingEnabled = false; - - /** - * Get the value of verboseLoggingEnabled. - * - * @return the value of verboseLoggingEnabled - */ - public static boolean isVerboseLoggingEnabled() { - return verboseLoggingEnabled; - } -}