From c21a40824e033493c191e2f0de1d2474b25b633a Mon Sep 17 00:00:00 2001 From: Martijn van Groningen Date: Tue, 5 Jun 2018 07:45:46 +0200 Subject: [PATCH] rename method --- .../src/main/java/org/elasticsearch/grok/Grok.java | 2 +- .../java/org/elasticsearch/grok/ThreadWatchdog.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/grok/src/main/java/org/elasticsearch/grok/Grok.java b/libs/grok/src/main/java/org/elasticsearch/grok/Grok.java index a3471550b2eba..02388d838bc2a 100644 --- a/libs/grok/src/main/java/org/elasticsearch/grok/Grok.java +++ b/libs/grok/src/main/java/org/elasticsearch/grok/Grok.java @@ -250,7 +250,7 @@ public Map captures(String text) { } if (result == Matcher.INTERRUPTED) { throw new RuntimeException("grok pattern matching was interrupted after [" + - threadWatchdog.maxExecutionTime() + "] ms"); + threadWatchdog.maxExecutionTimeInMillis() + "] ms"); } else if (result == Matcher.FAILED) { // TODO: I think we should throw an error here? return null; diff --git a/libs/grok/src/main/java/org/elasticsearch/grok/ThreadWatchdog.java b/libs/grok/src/main/java/org/elasticsearch/grok/ThreadWatchdog.java index c06e81ddb63c8..d0de7637d2c08 100644 --- a/libs/grok/src/main/java/org/elasticsearch/grok/ThreadWatchdog.java +++ b/libs/grok/src/main/java/org/elasticsearch/grok/ThreadWatchdog.java @@ -43,10 +43,10 @@ public interface ThreadWatchdog { void register(); /** - * @return The maximum allowed time for a thread to invoke {@link #unregister()} after {@link #register()} - * has been invoked before this ThreadWatchDog starts to interrupting that thread. + * @return The maximum allowed time in milliseconds for a thread to invoke {@link #unregister()} + * after {@link #register()} has been invoked before this ThreadWatchDog starts to interrupting that thread. */ - long maxExecutionTime(); + long maxExecutionTimeInMillis(); /** * Unregisters the current thread and prevents it from being interrupted. @@ -89,7 +89,7 @@ public void register() { } @Override - public long maxExecutionTime() { + public long maxExecutionTimeInMillis() { return Long.MAX_VALUE; } @@ -123,7 +123,7 @@ public void register() { } @Override - public long maxExecutionTime() { + public long maxExecutionTimeInMillis() { return maxExecutionTime; }