[MM-53269] Add configuration setting for integration requests timeout (#23805)
Co-authored-by: Michael Kochell <6913320+mickmister@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
7874daa6f7
Коммит
1fdddfe678
@@ -214,6 +214,8 @@ const (
|
||||
DataRetentionSettingsDefaultTimeBetweenBatchesMilliseconds = 100
|
||||
DataRetentionSettingsDefaultRetentionIdsBatchSize = 100
|
||||
|
||||
OutgoingIntegrationRequestsDefaultTimeout = 30
|
||||
|
||||
PluginSettingsDefaultDirectory = "./plugins"
|
||||
PluginSettingsDefaultClientDirectory = "./client/plugins"
|
||||
PluginSettingsDefaultEnableMarketplace = true
|
||||
@@ -309,6 +311,7 @@ type ServiceSettings struct {
|
||||
EnableIncomingWebhooks *bool `access:"integrations_integration_management"`
|
||||
EnableOutgoingWebhooks *bool `access:"integrations_integration_management"`
|
||||
EnableCommands *bool `access:"integrations_integration_management"`
|
||||
OutgoingIntegrationRequestsTimeout *int64 `access:"integrations_integration_management"` // In seconds.
|
||||
EnablePostUsernameOverride *bool `access:"integrations_integration_management"`
|
||||
EnablePostIconOverride *bool `access:"integrations_integration_management"`
|
||||
GoogleDeveloperKey *string `access:"site_posts,write_restrictable,cloud_restrictable"`
|
||||
@@ -509,6 +512,10 @@ func (s *ServiceSettings) SetDefaults(isUpdate bool) {
|
||||
s.EnableOutgoingWebhooks = NewBool(true)
|
||||
}
|
||||
|
||||
if s.OutgoingIntegrationRequestsTimeout == nil {
|
||||
s.OutgoingIntegrationRequestsTimeout = NewInt64(OutgoingIntegrationRequestsDefaultTimeout)
|
||||
}
|
||||
|
||||
if s.ConnectionSecurity == nil {
|
||||
s.ConnectionSecurity = NewString("")
|
||||
}
|
||||
@@ -4011,6 +4018,10 @@ func (s *ServiceSettings) isValid() *AppError {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.listen_address.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if *s.OutgoingIntegrationRequestsTimeout <= 0 {
|
||||
return NewAppError("Config.IsValid", "model.config.is_valid.outgoing_integrations_request_timeout.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
if *s.ExperimentalGroupUnreadChannels != GroupUnreadChannelsDisabled &&
|
||||
*s.ExperimentalGroupUnreadChannels != GroupUnreadChannelsDefaultOn &&
|
||||
*s.ExperimentalGroupUnreadChannels != GroupUnreadChannelsDefaultOff {
|
||||
|
||||
Ссылка в новой задаче
Block a user