github-mirrors/DependencyCheck
1
0
Fork 0
mirror of https://github.com/ysoftdevs/DependencyCheck.git synced 2026-01-15 08:13:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

added additional verbose logging

Browse Source 
Former-commit-id: bf5bbd5211216d16e06fb1ab6b03d44258312b2c
This commit is contained in:
Jeremy Long
2014-01-23 21:02:49 -05:00
parent 45e2215575
commit 5c781987a3
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java
View File

@@ -126,9 +126,10 @@ public final class ConnectionFactory {
private static String getConnectionString() throws IOException {
final String connStr = Settings.getString(Settings.KEYS.DB_CONNECTION_STRING, "jdbc:h2:file:%s;AUTO_SERVER=TRUE");
if (connStr.contains("%s")) {
final String fileName = getDataDirectory().getCanonicalPath();
final File file = new File(fileName, "cve." + DB_SCHEMA_VERSION);
return String.format(connStr, file.getAbsolutePath());
final String directory = getDataDirectory().getCanonicalPath();
final File data_file = new File(directory, "cve." + DB_SCHEMA_VERSION);
Logger.getLogger(ConnectionFactory.class.getName()).log(Level.FINE, String.format("File path for H2 file: '%s'", data_file.toString()));
return String.format(connStr, data_file.getAbsolutePath());
}
return connStr;
}

9
dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Settings.java
View File

@@ -276,13 +276,18 @@ public final class Settings {
*/
public static File getDataFile(String key) {
final String file = getString(key);
Logger.getLogger(Settings.class.getName()).log(Level.FINE, String.format("Settings.getDataFile() - file: '%s'", file));
if (file == null) {
return null;
}
if (file.startsWith("[JAR]/")) {
if (file.startsWith("[JAR]")) {
Logger.getLogger(Settings.class.getName()).log(Level.FINE, "Settings.getDataFile() - transforming filename");
final File jarPath = getJarPath();
Logger.getLogger(Settings.class.getName()).log(Level.FINE, String.format("Settings.getDataFile() - jar file: '%s'", jarPath.toString()));
final File newBase = new File(jarPath, file.substring(6));
return new File(newBase, file);
File retVal = new File(newBase, file);
Logger.getLogger(Settings.class.getName()).log(Level.FINE, String.format("Settings.getDataFile() - returning: '%s'", retVal.toString()));
return retVal;
}
return new File(file);
}