Commitc123fa7

Thomasr

committed

querytimeout unit to second, limit to max, rename env variable

1 parentaaae226 commitc123fa7Copy full SHA for c123fa7

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,11 @@`
`19`	`19`	`@Component`
`20`	`20`	`publicfinalclassQueryTimeoutUtils {`
`21`	`21`
`22`		`-privatestaticintdefaultQueryTimeoutMillis =10000;`
	`22`	`+privatestaticintdefaultQueryTimeout =10;`
`23`	`23`
`24`	`24`	`@Value("${default.query-timeout}")`
`25`		`-publicvoidsetDefaultQueryTimeoutMillis(intdefaultQueryTimeoutMillis) {`
`26`		`-QueryTimeoutUtils.defaultQueryTimeoutMillis =defaultQueryTimeoutMillis;`
	`25`	`+publicvoidsetDefaultQueryTimeoutMillis(intdefaultQueryTimeout) {`
	`26`	`+QueryTimeoutUtils.defaultQueryTimeout =defaultQueryTimeout;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`publicstaticintparseQueryTimeoutMs(StringtimeoutStr,Map<String,Object>paramMap,intmaxQueryTimeout) {`
`@@ -33,7 +33,7 @@ public static int parseQueryTimeoutMs(String timeoutStr, Map<String, Object> par`
`33`	`33`	`@VisibleForTesting`
`34`	`34`	`publicstaticintparseQueryTimeoutMs(StringtimeoutStr,intmaxQueryTimeout) {`
`35`	`35`	`if (StringUtils.isBlank(timeoutStr)) {`
`36`		`-returndefaultQueryTimeoutMillis;`
	`36`	`+returnMath.min(defaultQueryTimeout *1000, (int)Duration.ofSeconds(maxQueryTimeout).toMillis());`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`Pair<String,Integer>unitInfo =getUnitInfo(timeoutStr);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,4 @@ logging:`
`54`	`54`	`org.lowcoder:debug`
`55`	`55`
`56`	`56`	`default:`
`57`		`-query-timeout:${LOWCODER_DEFAULT_QUERY_TIMEOUT_MILLIS:10000}`
	`57`	`+query-timeout:${LOWCODER_DEFAULT_QUERY_TIMEOUT:10s}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -53,7 +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_MILLIS:10000}`
	`56`	`+query-timeout:${LOWCODER_DEFAULT_QUERY_TIMEOUT:10}`
`57`	`57`
`58`	`58`	`common:`
`59`	`59`	`cookie-name:LOWCODER_CE_SELFHOST_TOKEN`

Comments

(0)