github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-03-25 10:32:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

improved logging

Browse Source 
Former-commit-id: 5b6741a1d561cbf4c20ef98907ce99a2b245b42e
This commit is contained in:
Jeremy Long
2015-07-17 08:45:43 -04:00
parent 0ae228d6f8
commit 8cd68c7c16
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java
View File

@@ -27,6 +27,7 @@ import java.util.zip.ZipInputStream;
import org.junit.Before; import org.junit.Before;
import org.owasp.dependencycheck.BaseTest; import org.owasp.dependencycheck.BaseTest;
import org.owasp.dependencycheck.utils.Settings; import org.owasp.dependencycheck.utils.Settings;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
/** /**
@@ -37,6 +38,8 @@ public abstract class BaseDBTestCase extends BaseTest {
protected final static int BUFFER_SIZE = 2048; protected final static int BUFFER_SIZE = 2048;
private final static Logger LOGGER = LoggerFactory.getLogger(BaseDBTestCase.class);
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
ensureDBExists(); ensureDBExists();
@@ -46,7 +49,9 @@ public abstract class BaseDBTestCase extends BaseTest {
java.io.File dataPath = Settings.getDataDirectory(); java.io.File dataPath = Settings.getDataDirectory();
String fileName = Settings.getString(Settings.KEYS.DB_FILE_NAME); String fileName = Settings.getString(Settings.KEYS.DB_FILE_NAME);
LOGGER.trace("DB file name {}", fileName);
java.io.File dataFile = new File(dataPath, fileName); java.io.File dataFile = new File(dataPath, fileName);
LOGGER.trace("Ensuring {} exists", dataFile.toString());
if (!dataPath.exists() || !dataFile.exists()) { if (!dataPath.exists() || !dataFile.exists()) {
dataPath.mkdirs(); dataPath.mkdirs();
FileInputStream fis = null; FileInputStream fis = null;
@@ -75,7 +80,7 @@ public abstract class BaseDBTestCase extends BaseTest {
dest.write(data, 0, count); dest.write(data, 0, count);
} }
} catch (Throwable ex) { } catch (Throwable ex) {
LoggerFactory.getLogger(BaseDBTestCase.class).error("", ex); LOGGER.error("", ex);
} finally { } finally {
try { try {
if (dest != null) { if (dest != null) {
@@ -83,14 +88,14 @@ public abstract class BaseDBTestCase extends BaseTest {
dest.close(); dest.close();
} }
} catch (Throwable ex) { } catch (Throwable ex) {
LoggerFactory.getLogger(BaseDBTestCase.class).trace("", ex); LOGGER.trace("", ex);
} }
try { try {
if (fos != null) { if (fos != null) {
fos.close(); fos.close();
} }
} catch (Throwable ex) { } catch (Throwable ex) {
LoggerFactory.getLogger(BaseDBTestCase.class).trace("", ex); LOGGER.trace("", ex);
} }
} }
} }
@@ -100,14 +105,14 @@ public abstract class BaseDBTestCase extends BaseTest {
zin.close(); zin.close();
} }
} catch (Throwable ex) { } catch (Throwable ex) {
LoggerFactory.getLogger(BaseDBTestCase.class).trace("", ex); LOGGER.trace("", ex);
} }
try { try {
if (fis != null) { if (fis != null) {
fis.close(); fis.close();
} }
} catch (Throwable ex) { } catch (Throwable ex) {
LoggerFactory.getLogger(BaseDBTestCase.class).trace("", ex); LOGGER.trace("", ex);
} }
} }
} }

3
dependency-check-core/src/test/resources/logback-test.xml
View File

@@ -11,6 +11,9 @@
<appender-ref ref="console"/> <appender-ref ref="console"/>
</root> </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"> <!--logger name="org.owasp.dependencycheck.analyzer.AssemblyAnalyzerTest" additivity="false" level="WARN">
<appender-ref ref="console"/> <appender-ref ref="console"/>
</logger> </logger>