Skip to content

Commit 76a1823

Browse files
committed
Fix PodPatcher debug output
1 parent 53feb82 commit 76a1823

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

  • src/main/java/eu/openanalytics/containerproxy/backend/kubernetes

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/PodPatcher.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
import com.fasterxml.jackson.core.JsonProcessingException;
2424
import com.fasterxml.jackson.databind.ObjectMapper;
25+
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
2526
import com.fasterxml.jackson.datatype.jsr353.JSR353Module;
2627
import eu.openanalytics.containerproxy.model.runtime.Proxy;
2728
import eu.openanalytics.containerproxy.service.StructuredLogger;
@@ -43,6 +44,7 @@ public class PodPatcher {
4344
private Environment environment;
4445

4546
private final ObjectMapper mapper = new ObjectMapper();
47+
private final ObjectMapper writer = new ObjectMapper(new YAMLFactory());
4648

4749
private boolean loggingEnabled = false;
4850

@@ -51,6 +53,7 @@ public class PodPatcher {
5153
@PostConstruct
5254
public void init() {
5355
mapper.registerModule(new JSR353Module());
56+
writer.registerModule(new JSR353Module());
5457
loggingEnabled = Boolean.valueOf(environment.getProperty(DEBUG_PROPERTY, "false"));
5558
}
5659

@@ -79,11 +82,11 @@ public Pod patch(Pod pod, JsonPatch patch) {
7982
public Pod patchWithDebug(Proxy proxy, Pod pod, JsonPatch patch) throws JsonProcessingException {
8083
// TODO pretty print
8184
if (loggingEnabled) {
82-
log.info(proxy, "Original Pod: " + mapper.writeValueAsString(pod));
85+
log.info(proxy, "Original Pod: \n" + writer.writeValueAsString(pod));
8386
}
8487
Pod patchedPod = patch(pod, patch);
8588
if (loggingEnabled) {
86-
log.info(proxy, "Patched Pod: " + mapper.writeValueAsString(patchedPod));
89+
log.info(proxy, "Patched Pod: \n" + writer.writeValueAsString(patchedPod));
8790
}
8891
return patchedPod;
8992
}

0 commit comments

Comments
 (0)