IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2024-11-23 09:16:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

allow setting of logdir for appserver

Browse Source
This commit is contained in:
Jonathan Shook 2021-01-13 14:14:44 -06:00
parent f4ec45a1f5
commit e56444e29b
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docsys/src/main/java/io/nosqlbench/docsys/core/DocServerApp.java
View File

@ -76,13 +76,15 @@ public class DocServerApp {
private static void runServer(String[] serverArgs) {
NBWebServer server = new NBWebServer();
server.withContextParam("logpath", Path.of("logs")); // default
for (int i = 0; i < serverArgs.length; i++) {
String arg = serverArgs[i];
if (arg.matches(".*://.*")) {
if (!arg.toLowerCase().contains("http://")) {
String suggested = arg.toLowerCase().replaceAll("https", "http");
throw new RuntimeException("ERROR:\nIn this release, only 'http://' URLs are supported.\nTLS will be added in a future release.\nSee https://github.com/nosqlbench/nosqlbench/issues/35\n" +
"Consider using " + suggested);
"Consider using " + suggested);
}
server.withURL(arg);
} else if (Files.exists(Path.of(arg))) {
@ -105,6 +107,10 @@ public class DocServerApp {
String workspaces_root = serverArgs[i + 1];
logger.info("Setting workspace directory to workspace_dir");
server.withContextParam("workspaces_root", workspaces_root);
} else if (arg.matches("--logdir")) {
String logdir_path = serverArgs[i + 1];
logger.info("Setting docserver logdir to " + logdir_path);
server.withContextParam("logpath", Path.of(logdir_path));
}
}
//

4
engine-rest/src/main/java/io/nosqlbench/engine/rest/resources/ScenarioExecutorEndpoint.java
View File

@ -110,7 +110,9 @@ public class ScenarioExecutorEndpoint implements WebServiceObject {
true,
false,
"",
cmdList.toString());
cmdList.toString(),
(java.nio.file.Path) config.getProperties().get("logpath")
);
scenario.addScriptText(buffer.getParsedScript());