dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduced new configuration option

Browse Source
This commit is contained in:
Volodymyr Babak 2021-02-26 18:22:30 +02:00 committed by Andrew Shvayka
parent 594a1290db
commit eec8bb0202
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/src/main/resources/thingsboard.yml
View File

@ -545,6 +545,7 @@ transport:
http: http:
enabled: "${HTTP_ENABLED:true}" enabled: "${HTTP_ENABLED:true}"
request_timeout: "${HTTP_REQUEST_TIMEOUT:60000}" request_timeout: "${HTTP_REQUEST_TIMEOUT:60000}"
max_request_timeout: "${HTTP_MAX_REQUEST_TIMEOUT:300000}"
# Local MQTT transport parameters # Local MQTT transport parameters
mqtt: mqtt:
# Enable/disable mqtt transport protocol. # Enable/disable mqtt transport protocol.

8
common/transport/http/src/main/java/org/thingsboard/server/transport/http/HttpTransportContext.java
View File

@ -41,13 +41,17 @@ public class HttpTransportContext extends TransportContext {
@Value("${transport.http.request_timeout}") @Value("${transport.http.request_timeout}")
private long defaultTimeout; private long defaultTimeout;
@Getter
@Value("${transport.http.max_request_timeout}")
private long maxRequestTimeout;
@Bean @Bean
public TomcatConnectorCustomizer tomcatAsyncTimeoutConnectorCustomizer() { public TomcatConnectorCustomizer tomcatAsyncTimeoutConnectorCustomizer() {
return connector -> { return connector -> {
ProtocolHandler handler = connector.getProtocolHandler(); ProtocolHandler handler = connector.getProtocolHandler();
if (handler instanceof Http11NioProtocol) { if (handler instanceof Http11NioProtocol) {
log.trace("Setting async timeout {}", defaultTimeout); log.trace("Setting async max request timeout {}", maxRequestTimeout);
connector.setAsyncTimeout(defaultTimeout); connector.setAsyncTimeout(maxRequestTimeout);
} }
}; };
} }

1
transport/http/src/main/resources/tb-http-transport.yml
View File

@ -39,6 +39,7 @@ zk:
transport: transport:
http: http:
request_timeout: "${HTTP_REQUEST_TIMEOUT:60000}" request_timeout: "${HTTP_REQUEST_TIMEOUT:60000}"
max_request_timeout: "${HTTP_MAX_REQUEST_TIMEOUT:300000}"
sessions: sessions:
inactivity_timeout: "${TB_TRANSPORT_SESSIONS_INACTIVITY_TIMEOUT:300000}" inactivity_timeout: "${TB_TRANSPORT_SESSIONS_INACTIVITY_TIMEOUT:300000}"
report_timeout: "${TB_TRANSPORT_SESSIONS_REPORT_TIMEOUT:30000}" report_timeout: "${TB_TRANSPORT_SESSIONS_REPORT_TIMEOUT:30000}"