1 files changed, 13 insertions, 34 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 81a93d9f6b1..1f84c9eaac3 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
@@ -2,6 +2,7 @@
 package com.yahoo.container.handler;
 
 import com.google.inject.Inject;
+import com.yahoo.container.core.LogHandlerConfig;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.container.jdisc.ThreadedHttpRequestHandler;
@@ -11,21 +12,20 @@ import org.json.JSONObject;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
-import java.util.Arrays;
-import java.util.HashMap;
+import java.time.Instant;
+import java.util.Optional;
 import java.util.concurrent.Executor;
 
 public class LogHandler extends ThreadedHttpRequestHandler {
 
-    private static final String LOG_DIRECTORY = "/home/y/logs/vespa/logarchive/";
     private final LogReader logReader;
 
     @Inject
-    public LogHandler(Executor executor) {
-        this(executor, new LogReader());
+    public LogHandler(Executor executor, LogHandlerConfig config) {
+        this(executor, new LogReader(config.logDirectory(), config.logPattern()));
     }
 
-    protected LogHandler(Executor executor, LogReader logReader) {
+    LogHandler(Executor executor, LogReader logReader) {
         super(executor);
         this.logReader = logReader;
     }
@@ -34,11 +34,13 @@ public class LogHandler extends ThreadedHttpRequestHandler {
     public HttpResponse handle(HttpRequest request) {
         JSONObject responseJSON = new JSONObject();
 
-        HashMap<String, String> apiParams = getParameters(request);
-        long earliestLogThreshold = getEarliestThreshold(apiParams);
-        long latestLogThreshold = getLatestThreshold(apiParams);
+        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 {
-            JSONObject logJson = logReader.readLogs(LOG_DIRECTORY, earliestLogThreshold, latestLogThreshold);
+            JSONObject logJson = logReader.readLogs(earliestLogThreshold, latestLogThreshold);
             responseJSON.put("logs", logJson);
         } catch (IOException | JSONException e) {
             return new HttpResponse(404) {
@@ -46,6 +48,7 @@ public class LogHandler extends ThreadedHttpRequestHandler {
                 public void render(OutputStream outputStream) {}
             };
         }
+
         return new HttpResponse(200) {
             @Override
             public void render(OutputStream outputStream) throws IOException {
@@ -55,28 +58,4 @@ public class LogHandler extends ThreadedHttpRequestHandler {
             }
         };
     }
-
-    private HashMap<String, String> getParameters(HttpRequest request) {
-        String query = request.getUri().getQuery();
-        HashMap<String, String> keyValPair = new HashMap<>();
-        Arrays.stream(query.split("&")).forEach(pair -> {
-            String[] splitPair = pair.split("=");
-            keyValPair.put(splitPair[0], splitPair[1]);
-        });
-        return keyValPair;
-    }
-
-    private long getEarliestThreshold(HashMap<String, String> map) {
-        if (map.containsKey("from")) {
-            return Long.valueOf(map.get("from"));
-        }
-        return Long.MIN_VALUE;
-    }
-
-    private long getLatestThreshold(HashMap<String, String> map) {
-        if (map.containsKey("to")) {
-            return Long.valueOf(map.get("to"));
-        }
-        return Long.MAX_VALUE;
-    }
 }