Commit9e68335

authored

Merge pull request#1187 from lowcoder-org/feature/default_query_timeout

add Environment variable: LOWCODER_DEFAULT_QUERY_TIMEOUT_MILLIS

2 parentsfec96d2 +c123fa7 commit9e68335Copy full SHA for 9e68335

File tree

+14

-2

lines changed

+14

-2

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,18 @@`
`13`	`13`	`importorg.lowcoder.sdk.exception.PluginException;`
`14`	`14`
`15`	`15`	`importcom.google.common.annotations.VisibleForTesting;`
	`16`	`+importorg.springframework.beans.factory.annotation.Value;`
	`17`	`+importorg.springframework.stereotype.Component;`
`16`	`18`
	`19`	`+@Component`
`17`	`20`	`publicfinalclassQueryTimeoutUtils {`
`18`	`21`
`19`		`-privatestaticfinalintDEFAULT_QUERY_TIMEOUT_MILLIS =10000;`
	`22`	`+privatestaticintdefaultQueryTimeout =10;`
	`23`	`+`
	`24`	`+@Value("${default.query-timeout}")`
	`25`	`+publicvoidsetDefaultQueryTimeoutMillis(intdefaultQueryTimeout) {`
	`26`	`+QueryTimeoutUtils.defaultQueryTimeout =defaultQueryTimeout;`
	`27`	`+ }`
`20`	`28`
`21`	`29`	`publicstaticintparseQueryTimeoutMs(StringtimeoutStr,Map<String,Object>paramMap,intmaxQueryTimeout) {`
`22`	`30`	`returnparseQueryTimeoutMs(renderMustacheString(timeoutStr,paramMap),maxQueryTimeout);`
`@@ -25,7 +33,7 @@ public static int parseQueryTimeoutMs(String timeoutStr, Map<String, Object> par`
`25`	`33`	`@VisibleForTesting`
`26`	`34`	`publicstaticintparseQueryTimeoutMs(StringtimeoutStr,intmaxQueryTimeout) {`
`27`	`35`	`if (StringUtils.isBlank(timeoutStr)) {`
`28`		`-returnDEFAULT_QUERY_TIMEOUT_MILLIS;`
	`36`	`+returnMath.min(defaultQueryTimeout *1000, (int)Duration.ofSeconds(maxQueryTimeout).toMillis());`
`29`	`37`	`}`
`30`	`38`
`31`	`39`	`Pair<String,Integer>unitInfo =getUnitInfo(timeoutStr);`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,3 +52,6 @@ logging:`
`52`	`52`	`level:`
`53`	`53`	`root:debug`
`54`	`54`	`org.lowcoder:debug`
	`55`	`+`
	`56`	`+default:`
	`57`	`+query-timeout:${LOWCODER_DEFAULT_QUERY_TIMEOUT:10s}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ default:`
`53`	`53`	`org-app-count:${LOWCODER_MAX_APPS_PER_ORG:1000}`
`54`	`54`	`developer-count:${LOWCODER_MAX_DEVELOPERS:50}`
`55`	`55`	`api-rate-limit:${LOWCODER_API_RATE_LIMIT:50}`
	`56`	`+query-timeout:${LOWCODER_DEFAULT_QUERY_TIMEOUT:10}`
`56`	`57`
`57`	`58`	`common:`
`58`	`59`	`cookie-name:LOWCODER_CE_SELFHOST_TOKEN`

Comments

(0)