Skip to content

Commit bd1b65c

Browse files
author
Jérémy James Toussaint
committed
Replace docker logs line return for SGX check
1 parent 6af5ce8 commit bd1b65c

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/java/com/iexec/worker/docker/DockerClientService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,8 +303,8 @@ public Optional<DockerLogs> getContainerLogs(String containerId) {
303303
return Optional.empty();
304304
}
305305
return Optional.of(DockerLogs.builder()
306-
.stdout(stdout.toString().replace("\n", ""))
307-
.stderr(stderr.toString().replace("\n", ""))
306+
.stdout(stdout.toString())
307+
.stderr(stderr.toString())
308308
.build());
309309
}
310310

src/main/java/com/iexec/worker/sgx/SgxService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,6 @@ private boolean isSgxDeviceFound() {
105105
}
106106

107107
String stdout = dockerRunResponse.getDockerLogs() != null ? dockerRunResponse.getDockerLogs().getStdout() : "";
108-
return stdout.equals("true");
108+
return stdout.replace("\n", "").equals("true");
109109
}
110110
}

0 commit comments

Comments
 (0)