File tree 2 files changed +6
-6
lines changed
libs/grok/src/main/java/org/elasticsearch/grok 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) {
250
250
}
251
251
if (result == Matcher .INTERRUPTED ) {
252
252
throw new RuntimeException ("grok pattern matching was interrupted after [" +
253
- threadWatchdog .maxExecutionTime () + "] ms" );
253
+ threadWatchdog .maxExecutionTimeInMillis () + "] ms" );
254
254
} else if (result == Matcher .FAILED ) {
255
255
// TODO: I think we should throw an error here?
256
256
return null ;
Original file line number Diff line number Diff line change @@ -43,10 +43,10 @@ public interface ThreadWatchdog {
43
43
void register ();
44
44
45
45
/**
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.
48
48
*/
49
- long maxExecutionTime ();
49
+ long maxExecutionTimeInMillis ();
50
50
51
51
/**
52
52
* Unregisters the current thread and prevents it from being interrupted.
@@ -89,7 +89,7 @@ public void register() {
89
89
}
90
90
91
91
@ Override
92
- public long maxExecutionTime () {
92
+ public long maxExecutionTimeInMillis () {
93
93
return Long .MAX_VALUE ;
94
94
}
95
95
@@ -123,7 +123,7 @@ public void register() {
123
123
}
124
124
125
125
@ Override
126
- public long maxExecutionTime () {
126
+ public long maxExecutionTimeInMillis () {
127
127
return maxExecutionTime ;
128
128
}
129
129
You can’t perform that action at this time.
0 commit comments