From 190b9c4ce97664f90425a90fd759d4d5fc51989c Mon Sep 17 00:00:00 2001
From: Ola Aunrønning <olaa@oath.com>
Date: Fri, 5 Apr 2019 11:08:38 +0200
Subject: Remove old log reading

---
 .../com/yahoo/container/handler/LogHandler.java    | 40 +++-------------------
 1 file changed, 4 insertions(+), 36 deletions(-)

(limited to 'container-core/src/main/java/com/yahoo/container/handler/LogHandler.java')

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 f6bdeb02b9c..645c231531d 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
@@ -6,12 +6,8 @@ import com.yahoo.container.core.LogHandlerConfig;
 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.time.Instant;
 import java.util.Optional;
 import java.util.concurrent.Executor;
@@ -32,47 +28,19 @@ public class LogHandler extends ThreadedHttpRequestHandler {
 
     @Override
     public HttpResponse handle(HttpRequest request) {
-        JSONObject responseJSON = new JSONObject();
 
         Instant earliestLogThreshold = Optional.ofNullable(request.getProperty("from"))
                 .map(Long::valueOf).map(Instant::ofEpochMilli).orElse(Instant.MIN);
         Instant latestLogThreshold = Optional.ofNullable(request.getProperty("to"))
                 .map(Long::valueOf).map(Instant::ofEpochMilli).orElseGet(Instant::now);
 
-        try {
-            if (request.hasProperty("streaming")) {
-                return new HttpResponse(200) {
-                    {
-                        headers().add("Content-Encoding", "gzip");
-                    }
-
-                    @Override
-                    public void render(OutputStream outputStream) {
-                        logReader.writeLogs(outputStream, earliestLogThreshold, latestLogThreshold);
-                    }
-                };
-            }
-
-            JSONObject logJson = logReader.readLogs(earliestLogThreshold, latestLogThreshold);
-            responseJSON.put("logs", logJson);
-        } 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 {
-                OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
-                outputStreamWriter.write(responseJSON.toString());
-                outputStreamWriter.close();
+            {
+                headers().add("Content-Encoding", "gzip");
             }
-
             @Override
-            public String getContentType() {
-                return "application/json";
+            public void render(OutputStream outputStream) {
+                logReader.writeLogs(outputStream, earliestLogThreshold, latestLogThreshold);
             }
         };
     }
-- 
cgit v1.2.3