Replace HTTP response with Log class. Other cleanup

2 files changed, 5 insertions, 5 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 16f1b3ac62c..4c12bacf145 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
@@ -10,7 +10,6 @@ import org.json.JSONObject;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.net.URI;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.concurrent.Executor;
@@ -26,14 +25,15 @@ public class LogHandler extends ThreadedHttpRequestHandler {
 
     @Override
     public HttpResponse handle(HttpRequest request) {
-        JSONObject logJson;
+        JSONObject responseJSON = new JSONObject();
 
         HashMap<String, String> apiParams = getParameters(request);
         long earliestLogThreshold = getEarliestThreshold(apiParams);
         long latestLogThreshold = getLatestThreshold(apiParams);
         LogReader logReader= new LogReader(earliestLogThreshold, latestLogThreshold);
         try {
-            logJson = logReader.readLogs(LOG_DIRECTORY);
+            JSONObject logJson = logReader.readLogs(LOG_DIRECTORY);
+            responseJSON.put("logs", logJson.toString());
         } catch (IOException | JSONException e) {
             return new HttpResponse(404) {
                 @Override
@@ -44,7 +44,7 @@ public class LogHandler extends ThreadedHttpRequestHandler {
             @Override
             public void render(OutputStream outputStream) throws IOException {
                 OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream);
-                outputStreamWriter.write(logJson.toString());
+                outputStreamWriter.write(responseJSON.toString());
                 outputStreamWriter.close();
             }
         };
diff --git a/container-core/src/test/java/com/yahoo/container/handler/LogReaderTest.java b/container-core/src/test/java/com/yahoo/container/handler/LogReaderTest.java
index 1a8d5680882..534026f89ac 100644
--- a/container-core/src/test/java/com/yahoo/container/handler/LogReaderTest.java
+++ b/container-core/src/test/java/com/yahoo/container/handler/LogReaderTest.java
@@ -22,7 +22,7 @@ public class LogReaderTest {
         String logDirectory = "src/test/resources/logfolder/";
         LogReader logReader = new LogReader(21, Long.MAX_VALUE);
         JSONObject json = logReader.readLogs(logDirectory);
-        String expected = "{\"subfolder\":{\"log2.log\":\"VGhpcyBpcyBhbm90aGVyIGxvZyBmaWxl\"},\"log1.log\":\"VGhpcyBpcyBvbmUgbG9nIGZpbGU=\"}";
+        String expected = "{\"subfolder-log2.log\":\"VGhpcyBpcyBhbm90aGVyIGxvZyBmaWxl\",\"log1.log\":\"VGhpcyBpcyBvbmUgbG9nIGZpbGU=\"}";
         String actual = json.toString();
         assertEquals(expected, actual);
     }