Use vespajlib's ExceptionUtils in clustercontroller-core

2 files changed, 4 insertions, 13 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
index d1675f189c0..d943cf27f9c 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.clustercontroller.core;
 
 import com.yahoo.document.FixedBucketSpaces;
+import com.yahoo.exception.ExceptionUtils;
 import com.yahoo.jrt.ListenFailedException;
 import com.yahoo.log.LogLevel;
 import com.yahoo.vdslib.distribution.ConfiguredNode;
@@ -30,8 +31,6 @@ import com.yahoo.vespa.clustercontroller.utils.util.MetricReporter;
 import com.yahoo.vespa.clustercontroller.utils.util.NoMetricReporter;
 
 import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -548,10 +547,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
         } catch (Exception e) {
             responseCode = StatusPageResponse.ResponseCode.INTERNAL_SERVER_ERROR;
             message = "Internal Server Error";
-            StringWriter sw = new StringWriter();
-            PrintWriter pw = new PrintWriter(sw, true);
-            e.printStackTrace(pw);
-            hiddenMessage = sw.getBuffer().toString();
+            hiddenMessage = ExceptionUtils.getStackTraceAsString(e);;
             log.log(LogLevel.DEBUG, "Unknown exception thrown for request " + httpRequest.getRequest() +
                     ": " + hiddenMessage);
         }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java
index b736bae82c8..6e4c0bc7eaa 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java
@@ -1,14 +1,13 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.clustercontroller.core.status.statuspage;
 
+import com.yahoo.exception.ExceptionUtils;
 import com.yahoo.log.LogLevel;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -186,11 +185,7 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface {
                         response.setResponseCode(StatusPageResponse.ResponseCode.INTERNAL_SERVER_ERROR);
                         StringBuilder content = new StringBuilder();
                         response.writeHtmlHeader(content, "Internal Server Error");
-                        try (StringWriter sw = new StringWriter();
-                             PrintWriter pw = new PrintWriter(sw, true)) {
-                            e.printStackTrace(pw);
-                            response.writeHtmlFooter(content, sw.getBuffer().toString());
-                        }
+                        response.writeHtmlFooter(content, ExceptionUtils.getStackTraceAsString(e));
                         response.writeContent(content.toString());
                     }
                     if (response == null) {