From 8cd68c7c16347bdbdbd9bc3ab7fe506d5b69483d Mon Sep 17 00:00:00 2001
From: Jeremy Long <jeremy.long@gmail.com>
Date: Fri, 17 Jul 2015 08:45:43 -0400
Subject: [PATCH] improved logging

Former-commit-id: 5b6741a1d561cbf4c20ef98907ce99a2b245b42e
---
 .../data/nvdcve/BaseDBTestCase.java               | 15 ++++++++++-----
 .../src/test/resources/logback-test.xml           |  3 +++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java
index 76fe5cecd..83560d0c9 100644
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java
@@ -27,6 +27,7 @@ import java.util.zip.ZipInputStream;
 import org.junit.Before;
 import org.owasp.dependencycheck.BaseTest;
 import org.owasp.dependencycheck.utils.Settings;
+import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -37,6 +38,8 @@ public abstract class BaseDBTestCase extends BaseTest {
 
     protected final static int BUFFER_SIZE = 2048;
 
+    private final static Logger LOGGER = LoggerFactory.getLogger(BaseDBTestCase.class);
+
     @Before
     public void setUp() throws Exception {
         ensureDBExists();
@@ -46,7 +49,9 @@ public abstract class BaseDBTestCase extends BaseTest {
 
         java.io.File dataPath = Settings.getDataDirectory();
         String fileName = Settings.getString(Settings.KEYS.DB_FILE_NAME);
+        LOGGER.trace("DB file name {}", fileName);
         java.io.File dataFile = new File(dataPath, fileName);
+        LOGGER.trace("Ensuring {} exists", dataFile.toString());
         if (!dataPath.exists() || !dataFile.exists()) {
             dataPath.mkdirs();
             FileInputStream fis = null;
@@ -75,7 +80,7 @@ public abstract class BaseDBTestCase extends BaseTest {
                             dest.write(data, 0, count);
                         }
                     } catch (Throwable ex) {
-                        LoggerFactory.getLogger(BaseDBTestCase.class).error("", ex);
+                        LOGGER.error("", ex);
                     } finally {
                         try {
                             if (dest != null) {
@@ -83,14 +88,14 @@ public abstract class BaseDBTestCase extends BaseTest {
                                 dest.close();
                             }
                         } catch (Throwable ex) {
-                            LoggerFactory.getLogger(BaseDBTestCase.class).trace("", ex);
+                            LOGGER.trace("", ex);
                         }
                         try {
                             if (fos != null) {
                                 fos.close();
                             }
                         } catch (Throwable ex) {
-                            LoggerFactory.getLogger(BaseDBTestCase.class).trace("", ex);
+                            LOGGER.trace("", ex);
                         }
                     }
                 }
@@ -100,14 +105,14 @@ public abstract class BaseDBTestCase extends BaseTest {
                         zin.close();
                     }
                 } catch (Throwable ex) {
-                    LoggerFactory.getLogger(BaseDBTestCase.class).trace("", ex);
+                    LOGGER.trace("", ex);
                 }
                 try {
                     if (fis != null) {
                         fis.close();
                     }
                 } catch (Throwable ex) {
-                    LoggerFactory.getLogger(BaseDBTestCase.class).trace("", ex);
+                    LOGGER.trace("", ex);
                 }
             }
         }
diff --git a/dependency-check-core/src/test/resources/logback-test.xml b/dependency-check-core/src/test/resources/logback-test.xml
index a3cc87b96..97d2b4f91 100644
--- a/dependency-check-core/src/test/resources/logback-test.xml
+++ b/dependency-check-core/src/test/resources/logback-test.xml
@@ -11,6 +11,9 @@
         <appender-ref ref="console"/>
     </root>
 
+    <logger name="org.owasp.dependencycheck.data.nvdcve.BaseDBTestCase" additivity="false" level="TRACE">
+        <appender-ref ref="console"/>
+    </logger>
     <!--logger name="org.owasp.dependencycheck.analyzer.AssemblyAnalyzerTest" additivity="false" level="WARN">
         <appender-ref ref="console"/>
     </logger>