Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'hotfix/action-execution-timeout-bug' into 'release'

Browse Source 
Fixing action execution timeout bug which was defaulting the execution timeout to 0 instead of 10.

See merge request theappsmith/internal-tools-server!89
This commit is contained in:
Arpit Mohan 2019-11-26 12:52:54 +00:00
commit 1637d2c7c2
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/server/appsmith-interfaces/src/main/java/com/appsmith/external/constants/ActionConstants.java vendored Normal file
View File

@ -0,0 +1,6 @@
package com.appsmith.external.constants;
public class ActionConstants {
// Default the action execution to 10s
public static final int DEFAULT_ACTION_EXECUTION_TIMEOUT_MS = 10000;
}

9
app/server/appsmith-interfaces/src/main/java/com/appsmith/external/models/ActionConfiguration.java vendored
View File

@ -10,6 +10,8 @@ import org.springframework.http.HttpMethod;
import java.util.List;
import java.util.Map;
import static com.appsmith.external.constants.ActionConstants.DEFAULT_ACTION_EXECUTION_TIMEOUT_MS;
@Getter
@Setter
@ToString
@ -25,7 +27,7 @@ public class ActionConfiguration {
* action execution.
*/
int timeoutInMillisecond = 10000;
Integer timeoutInMillisecond;
// API fields
String path;
@ -52,4 +54,9 @@ public class ActionConfiguration {
* understands what the keys stand for.
*/
List<Property> pluginSpecifiedTemplates;
public Integer getTimeoutInMillisecond() {
return (timeoutInMillisecond == null || timeoutInMillisecond <= 0) ?
DEFAULT_ACTION_EXECUTION_TIMEOUT_MS : timeoutInMillisecond;
}
}