summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2022-01-27 15:15:36 +0100
committerMartin Polden <mpolden@mpolden.no>2022-01-27 15:15:36 +0100
commita17e23f21bd8c471dce9e86643fc48bd96e89fbb (patch)
tree93c2d976878d947090cb5d61bd8ce71730f5ac36 /controller-server
parent81aeddf945aadb85a916a8f31b07d65685d9a5bb (diff)
Ensure failure messages end with newline
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java
index 6116b2e27b6..dffc7bf43b4 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/proxy/ConfigServerRestExecutorImpl.java
@@ -105,7 +105,7 @@ public class ConfigServerRestExecutorImpl extends AbstractComponent implements C
}
}
- throw new RuntimeException("Failed talking to config servers: " + errorBuilder.toString());
+ throw new RuntimeException("Failed talking to config servers: " + errorBuilder);
}
private Optional<ProxyResponse> proxy(ProxyRequest request, URI url, StringBuilder errorBuilder) {
@@ -118,9 +118,9 @@ public class ConfigServerRestExecutorImpl extends AbstractComponent implements C
String content = getContent(response);
int status = response.getStatusLine().getStatusCode();
if (status / 100 == 5) {
- errorBuilder.append("Talking to server ").append(url.getHost());
- errorBuilder.append(", got ").append(status).append(" ")
- .append(content).append("\n");
+ errorBuilder.append("Talking to server ").append(url.getHost())
+ .append(", got ").append(status).append(" ")
+ .append(content).append("\n");
LOG.log(Level.FINE, () -> Text.format("Got response from %s with status code %d and content:\n %s",
url.getHost(), status, content));
return Optional.empty();
@@ -135,8 +135,9 @@ public class ConfigServerRestExecutorImpl extends AbstractComponent implements C
// Send response back
return Optional.of(new ProxyResponse(request, content, status, url, contentType));
} catch (Exception e) {
- errorBuilder.append("Talking to server ").append(url.getHost());
- errorBuilder.append(" got exception ").append(e.getMessage());
+ errorBuilder.append("Talking to server ").append(url.getHost())
+ .append(" got exception ").append(e.getMessage())
+ .append("\n");
LOG.log(Level.FINE, e, () -> "Got exception while sending request to " + url.getHost());
return Optional.empty();
}