Browse Source
Merge pull request #11653 from thingsboard/fix/ws-subs-rate-limit
Disable WS subscriptions rate limits by default
pull/11654/head
Viacheslav Klimov
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
4 additions and
4 deletions
-
application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbLocalSubscriptionService.java
-
application/src/main/resources/thingsboard.yml
|
|
|
@ -101,9 +101,9 @@ public class DefaultTbLocalSubscriptionService implements TbLocalSubscriptionSer |
|
|
|
private ExecutorService tsCallBackExecutor; |
|
|
|
private ScheduledExecutorService staleSessionCleanupExecutor; |
|
|
|
|
|
|
|
@Value("${server.ws.rate_limits.subscriptions_per_tenant:2000:60}") |
|
|
|
@Value("${server.ws.rate_limits.subscriptions_per_tenant:}") |
|
|
|
private String subscriptionsPerTenantRateLimit; |
|
|
|
@Value("${server.ws.rate_limits.subscriptions_per_user:500:60}") |
|
|
|
@Value("${server.ws.rate_limits.subscriptions_per_user:}") |
|
|
|
private String subscriptionsPerUserRateLimit; |
|
|
|
|
|
|
|
public DefaultTbLocalSubscriptionService(AttributesService attrService, TimeseriesService tsService, TbServiceInfoProvider serviceInfoProvider, |
|
|
|
|
|
|
|
@ -84,9 +84,9 @@ server: |
|
|
|
auth_timeout_ms: "${TB_SERVER_WS_AUTH_TIMEOUT_MS:10000}" |
|
|
|
rate_limits: |
|
|
|
# Per-tenant rate limit for WS subscriptions |
|
|
|
subscriptions_per_tenant: "${TB_SERVER_WS_SUBSCRIPTIONS_PER_TENANT_RATE_LIMIT:2000:60}" |
|
|
|
subscriptions_per_tenant: "${TB_SERVER_WS_SUBSCRIPTIONS_PER_TENANT_RATE_LIMIT:}" |
|
|
|
# Per-user rate limit for WS subscriptions |
|
|
|
subscriptions_per_user: "${TB_SERVER_WS_SUBSCRIPTIONS_PER_USER_RATE_LIMIT:500:60}" |
|
|
|
subscriptions_per_user: "${TB_SERVER_WS_SUBSCRIPTIONS_PER_USER_RATE_LIMIT:}" |
|
|
|
rest: |
|
|
|
server_side_rpc: |
|
|
|
# Minimum value of the server-side RPC timeout. May override value provided in the REST API call. |
|
|
|
|
