1 files changed, 16 insertions, 2 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java b/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java
index 474d7d7321a..4183b642af1 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/LogHandler.java
@@ -1,12 +1,15 @@
 package com.yahoo.container.handler;
 
-import com.fasterxml.jackson.core.JsonFactory;
 import com.google.inject.Inject;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.container.jdisc.ThreadedHttpRequestHandler;
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.util.concurrent.Executor;
 
 public class LogHandler extends ThreadedHttpRequestHandler {
@@ -20,11 +23,22 @@ public class LogHandler extends ThreadedHttpRequestHandler {
 
     @Override
     public HttpResponse handle(HttpRequest request) {
+        JSONObject logJson;
 
+        try {
+            logJson = LogReader.readLogs(LOG_DIRECTORY);
+        } catch (IOException | JSONException e) {
+            return new HttpResponse(404) {
+                @Override
+                public void render(OutputStream outputStream) {}
+            };
+        }
         return new HttpResponse(200) {
             @Override
             public void render(OutputStream outputStream) throws IOException {
-                LogReader.writeToOutputStream(LOG_DIRECTORY, outputStream);
+                OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
+                outputStreamWriter.write(logJson.toString());
+                outputStreamWriter.close();
             }
         };
     }