[MM-42703] - Add configuration setting to disable Inactive Server email notification (#19831)
* [MM-42703] - Add configuration setting to disable Inactive Server email notification * remove log * add config to telemetry * fix lint
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
0efb7bf07d
Коммит
82c8bd33ed
@@ -17,6 +17,11 @@ import (
|
||||
const serverInactivityHours = 100
|
||||
|
||||
func (s *Server) doInactivityCheck() {
|
||||
if !*s.Config().EmailSettings.EnableInactivityEmail {
|
||||
mlog.Info("No activity check because EnableInactivityEmail is false")
|
||||
return
|
||||
}
|
||||
|
||||
if !s.Config().FeatureFlags.EnableInactivityCheckJob {
|
||||
mlog.Info("No activity check because EnableInactivityCheckJob feature flag is disabled")
|
||||
return
|
||||
|
||||
@@ -1541,6 +1541,7 @@ type EmailSettings struct {
|
||||
LoginButtonColor *string `access:"experimental_features"`
|
||||
LoginButtonBorderColor *string `access:"experimental_features"`
|
||||
LoginButtonTextColor *string `access:"experimental_features"`
|
||||
EnableInactivityEmail *bool
|
||||
}
|
||||
|
||||
func (s *EmailSettings) SetDefaults(isUpdate bool) {
|
||||
@@ -1683,6 +1684,10 @@ func (s *EmailSettings) SetDefaults(isUpdate bool) {
|
||||
if s.LoginButtonTextColor == nil {
|
||||
s.LoginButtonTextColor = NewString("#2389D7")
|
||||
}
|
||||
|
||||
if s.EnableInactivityEmail == nil {
|
||||
s.EnableInactivityEmail = NewBool(true)
|
||||
}
|
||||
}
|
||||
|
||||
type RateLimitSettings struct {
|
||||
|
||||
@@ -567,6 +567,7 @@ func (ts *TelemetryService) trackConfig() {
|
||||
"isdefault_login_button_border_color": isDefault(*cfg.EmailSettings.LoginButtonBorderColor, ""),
|
||||
"isdefault_login_button_text_color": isDefault(*cfg.EmailSettings.LoginButtonTextColor, ""),
|
||||
"smtp_server_timeout": *cfg.EmailSettings.SMTPServerTimeout,
|
||||
"enable_inactivity_email": *cfg.EmailSettings.EnableInactivityEmail,
|
||||
})
|
||||
|
||||
ts.SendTelemetry(TrackConfigRate, map[string]interface{}{
|
||||
|
||||
@@ -164,7 +164,8 @@
|
||||
"EmailNotificationContentsType": "full",
|
||||
"LoginButtonColor": "",
|
||||
"LoginButtonBorderColor": "",
|
||||
"LoginButtonTextColor": ""
|
||||
"LoginButtonTextColor": "",
|
||||
"EnableInactivityEmail": true
|
||||
},
|
||||
"RateLimitSettings": {
|
||||
"Enable": false,
|
||||
|
||||
Ссылка в новой задаче
Block a user