File tree Expand file tree Collapse file tree 2 files changed +6
-6
lines changed
libs/grok/src/main/java/org/elasticsearch/grok Expand file tree Collapse file tree 2 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -250,7 +250,7 @@ public Map<String, Object> captures(String text) {
250250 }
251251 if (result == Matcher .INTERRUPTED ) {
252252 throw new RuntimeException ("grok pattern matching was interrupted after [" +
253- threadWatchdog .maxExecutionTime () + "] ms" );
253+ threadWatchdog .maxExecutionTimeInMillis () + "] ms" );
254254 } else if (result == Matcher .FAILED ) {
255255 // TODO: I think we should throw an error here?
256256 return null ;
Original file line number Diff line number Diff line change @@ -43,10 +43,10 @@ public interface ThreadWatchdog {
4343 void register ();
4444
4545 /**
46- * @return The maximum allowed time for a thread to invoke {@link #unregister()} after {@link #register ()}
47- * has been invoked before this ThreadWatchDog starts to interrupting that thread.
46+ * @return The maximum allowed time in milliseconds for a thread to invoke {@link #unregister()}
47+ * after {@link #register()} has been invoked before this ThreadWatchDog starts to interrupting that thread.
4848 */
49- long maxExecutionTime ();
49+ long maxExecutionTimeInMillis ();
5050
5151 /**
5252 * Unregisters the current thread and prevents it from being interrupted.
@@ -89,7 +89,7 @@ public void register() {
8989 }
9090
9191 @ Override
92- public long maxExecutionTime () {
92+ public long maxExecutionTimeInMillis () {
9393 return Long .MAX_VALUE ;
9494 }
9595
@@ -123,7 +123,7 @@ public void register() {
123123 }
124124
125125 @ Override
126- public long maxExecutionTime () {
126+ public long maxExecutionTimeInMillis () {
127127 return maxExecutionTime ;
128128 }
129129
You can’t perform that action at this time.
0 commit comments