Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,15 @@ static class CachingService {

public void start() {
int basePort = BASE_PORTS[index];
log.info("Starting caching service on port {}", basePort);
String service = isModulith ? "apiml" : "caching-service";

log.info("Starting {} on port {}", service, basePort);

var env = new HashMap<String, String>();
env.put("ZWE_haInstance_id", "localhost" + String.valueOf(basePort).charAt(0));
env.put("APIML_ENABLED", isModulith ? "true" : "false");
env.put("logbackService", "ZWEACS" + (index + 1));
env.put("LAUNCH_COMPONENT", "caching-service/build/libs");
env.put("logbackService", (isModulith ? "ZWEGW" : "ZWEACS") + (index + 1));
env.put("LAUNCH_COMPONENT", service + "/build/libs");

env.put("ZWE_configs_port", String.valueOf(basePort + 25));

Expand All @@ -194,7 +196,12 @@ public void start() {
env.put("attlsEnabledOnInfinispanTest", isAttls ? "true" : "false");
env.put("ZWE_zowe_network_client_tls_attls", isAttls ? "true" : "false");

ProcessBuilder builder = new ProcessBuilder("caching-service-package/src/main/resources/bin/start.sh");
if (isModulith) {
env.put("ZWE_configs_internal_discovery_port", String.valueOf(basePort + 1));
env.put("ZWE_configs_apiml_security_authorization_provider", "dummy");
}

ProcessBuilder builder = new ProcessBuilder(service + "-package/src/main/resources/bin/start.sh");
builder.environment().putAll(env);

File binFolder = new File("../");
Expand Down Expand Up @@ -229,6 +236,7 @@ void readLogs(Process process, Consumer<String> onPid) {

void issue(String... parts) {
ProcessBuilder builder = new ProcessBuilder(parts);
builder.redirectErrorStream(true);
try {
var process = builder.start();
readLogs(process, pid -> {
Expand Down
Loading