IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

minor fixes, openssl npe, wording

Browse Source
This commit is contained in:
Jonathan Shook
2020-05-01 16:49:26 -05:00
parent bcb03deb50
commit 5d540ef42e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
engine-api/src/main/java/io/nosqlbench/engine/api/util/SSLKsFactory.java
View File

@@ -132,7 +132,8 @@ public class SSLKsFactory {
try {
KeyStore ks = KeyStore.getInstance("JKS", "SUN");
ks.load(null, keyPassword.toCharArray());
char[] pass = keyPassword==null? null : keyPassword.toCharArray();
ks.load(null, pass);
X509Certificate cert = (X509Certificate) CertificateFactory.
getInstance("X509").
@@ -176,4 +177,4 @@ public class SSLKsFactory {
return null;
}
}
}
}

2
engine-cli/src/main/java/io/nosqlbench/engine/cli/NBCLI.java
View File

@@ -187,7 +187,7 @@ public class NBCLI {
DockerMetricsManager dmh = new DockerMetricsManager();
dmh.startMetrics();
String warn = "Docker Containers are started, for grafana and prometheus, hit" +
"these urls in your browser: http://<host>:3000 and http://<host>:9090";
" these urls in your browser: http://<host>:3000 and http://<host>:9090";
logger.warn(warn);
if (reportGraphiteTo != null) {
logger.warn(String.format("Docker metrics are enabled (--docker-metrics)" +