[MM-16751] golint model (#17896)
Этот коммит содержится в:
Ben Schumacher
коммит произвёл
Claudio Costa
Claudio Costa
родитель
953eebdef4
Коммит
97ccf0bdf6
@@ -338,7 +338,7 @@ func NewServer(options ...Option) (*Server, error) {
|
||||
return nil, errors.Wrap(err, "Unable to create pending post ids cache")
|
||||
}
|
||||
if s.statusCache, err = s.CacheProvider.NewCache(&cache.CacheOptions{
|
||||
Size: model.STATUS_CACHE_SIZE,
|
||||
Size: model.StatusCacheSize,
|
||||
Striped: true,
|
||||
StripedBuckets: maxInt(runtime.NumCPU()-1, 1),
|
||||
}); err != nil {
|
||||
@@ -426,7 +426,7 @@ func NewServer(options ...Option) (*Server, error) {
|
||||
s.configListenerId = s.AddConfigListener(func(_, _ *model.Config) {
|
||||
s.configOrLicenseListener()
|
||||
|
||||
message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CONFIG_CHANGED, "", "", "", nil)
|
||||
message := model.NewWebSocketEvent(model.WebsocketEventConfigChanged, "", "", "", nil)
|
||||
|
||||
message.Add("config", s.ClientConfigWithComputed())
|
||||
s.Go(func() {
|
||||
@@ -436,7 +436,7 @@ func NewServer(options ...Option) (*Server, error) {
|
||||
s.licenseListenerId = s.AddLicenseListener(func(oldLicense, newLicense *model.License) {
|
||||
s.configOrLicenseListener()
|
||||
|
||||
message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_LICENSE_CHANGED, "", "", "", nil)
|
||||
message := model.NewWebSocketEvent(model.WebsocketEventLicenseChanged, "", "", "", nil)
|
||||
message.Add("license", s.GetSanitizedClientLicense())
|
||||
s.Go(func() {
|
||||
s.Publish(message)
|
||||
@@ -1109,7 +1109,7 @@ func (s *Server) Restart() error {
|
||||
}
|
||||
|
||||
func (s *Server) isUpgradedFromTE() bool {
|
||||
val, err := s.Store.System().GetByName(model.SYSTEM_UPGRADED_FROM_TE_ID)
|
||||
val, err := s.Store.System().GetByName(model.SystemUpgradedFromTeId)
|
||||
if err != nil {
|
||||
return false
|
||||
}
|
||||
@@ -1124,7 +1124,7 @@ func (s *Server) UpgradeToE0() error {
|
||||
if err := upgrader.UpgradeToE0(); err != nil {
|
||||
return err
|
||||
}
|
||||
upgradedFromTE := &model.System{Name: model.SYSTEM_UPGRADED_FROM_TE_ID, Value: "true"}
|
||||
upgradedFromTE := &model.System{Name: model.SystemUpgradedFromTeId, Value: "true"}
|
||||
s.Store.System().Save(upgradedFromTE)
|
||||
return nil
|
||||
}
|
||||
@@ -1247,7 +1247,7 @@ func (s *Server) Start() error {
|
||||
|
||||
addr := *s.Config().ServiceSettings.ListenAddress
|
||||
if addr == "" {
|
||||
if *s.Config().ServiceSettings.ConnectionSecurity == model.CONN_SECURITY_TLS {
|
||||
if *s.Config().ServiceSettings.ConnectionSecurity == model.ConnSecurityTls {
|
||||
addr = ":https"
|
||||
} else {
|
||||
addr = ":http"
|
||||
@@ -1307,7 +1307,7 @@ func (s *Server) Start() error {
|
||||
s.didFinishListen = make(chan struct{})
|
||||
go func() {
|
||||
var err error
|
||||
if *s.Config().ServiceSettings.ConnectionSecurity == model.CONN_SECURITY_TLS {
|
||||
if *s.Config().ServiceSettings.ConnectionSecurity == model.ConnSecurityTls {
|
||||
|
||||
tlsConfig := &tls.Config{
|
||||
PreferServerCipherSuites: true,
|
||||
@@ -1486,7 +1486,7 @@ func (s *Server) runLicenseExpirationCheckJob() {
|
||||
func runReportToAWSMeterJob(s *Server) {
|
||||
model.CreateRecurringTask("Collect and send usage report to AWS Metering Service", func() {
|
||||
doReportUsageToAWSMeteringService(s)
|
||||
}, time.Hour*model.AWS_METERING_REPORT_INTERVAL)
|
||||
}, time.Hour*model.AwsMeteringReportInterval)
|
||||
}
|
||||
|
||||
func doReportUsageToAWSMeteringService(s *Server) {
|
||||
@@ -1496,8 +1496,8 @@ func doReportUsageToAWSMeteringService(s *Server) {
|
||||
return
|
||||
}
|
||||
|
||||
dimensions := []string{model.AWS_METERING_DIMENSION_USAGE_HRS}
|
||||
reports := awsMeter.GetUserCategoryUsage(dimensions, time.Now().UTC(), time.Now().Add(-model.AWS_METERING_REPORT_INTERVAL*time.Hour).UTC())
|
||||
dimensions := []string{model.AwsMeteringDimensionUsageHrs}
|
||||
reports := awsMeter.GetUserCategoryUsage(dimensions, time.Now().UTC(), time.Now().Add(-model.AwsMeteringReportInterval*time.Hour).UTC())
|
||||
awsMeter.ReportUserCategoryUsage(reports)
|
||||
}
|
||||
|
||||
@@ -1506,14 +1506,14 @@ func runCheckWarnMetricStatusJob(a *App, c *request.Context) {
|
||||
doCheckWarnMetricStatus(a, c)
|
||||
model.CreateRecurringTask("Check Warn Metric Status Job", func() {
|
||||
doCheckWarnMetricStatus(a, c)
|
||||
}, time.Hour*model.WARN_METRIC_JOB_INTERVAL)
|
||||
}, time.Hour*model.WarnMetricJobInterval)
|
||||
}
|
||||
|
||||
func runCheckAdminSupportStatusJob(a *App, c *request.Context) {
|
||||
doCheckAdminSupportStatus(a, c)
|
||||
model.CreateRecurringTask("Check Admin Support Status Job", func() {
|
||||
doCheckAdminSupportStatus(a, c)
|
||||
}, time.Hour*model.WARN_METRIC_JOB_INTERVAL)
|
||||
}, time.Hour*model.WarnMetricJobInterval)
|
||||
}
|
||||
|
||||
func doSecurity(s *Server) {
|
||||
@@ -1554,10 +1554,10 @@ func doCheckWarnMetricStatus(a *App, c *request.Context) {
|
||||
warnMetricStatusFromStore := make(map[string]string)
|
||||
|
||||
for key, value := range systemDataList {
|
||||
if strings.HasPrefix(key, model.WARN_METRIC_STATUS_STORE_PREFIX) {
|
||||
if strings.HasPrefix(key, model.WarnMetricStatusStorePrefix) {
|
||||
if _, ok := model.WarnMetricsTable[key]; ok {
|
||||
warnMetricStatusFromStore[key] = value
|
||||
if value == model.WARN_METRIC_STATUS_ACK {
|
||||
if value == model.WarnMetricStatusAck {
|
||||
// If any warn metric has already been acked, we return
|
||||
mlog.Debug("Warn metrics have been acked, skip")
|
||||
return
|
||||
@@ -1572,7 +1572,7 @@ func doCheckWarnMetricStatus(a *App, c *request.Context) {
|
||||
} else {
|
||||
currentTime := utils.MillisFromTime(time.Now())
|
||||
// If the admin advisory has already been shown in the last 7 days
|
||||
if (currentTime-lastWarnMetricRunTimestamp)/(model.WARN_METRIC_JOB_WAIT_TIME) < 1 {
|
||||
if (currentTime-lastWarnMetricRunTimestamp)/(model.WarnMetricJobWaitTime) < 1 {
|
||||
mlog.Debug("No advisories should be shown during the wait interval time")
|
||||
return
|
||||
}
|
||||
@@ -1588,7 +1588,7 @@ func doCheckWarnMetricStatus(a *App, c *request.Context) {
|
||||
mlog.Debug("Error attempting to get number of teams.", mlog.Err(err1))
|
||||
}
|
||||
|
||||
openChannelCount, err2 := a.Srv().Store.Channel().AnalyticsTypeCount("", model.CHANNEL_OPEN)
|
||||
openChannelCount, err2 := a.Srv().Store.Channel().AnalyticsTypeCount("", model.ChannelTypeOpen)
|
||||
if err2 != nil {
|
||||
mlog.Debug("Error attempting to get number of public channels.", mlog.Err(err2))
|
||||
}
|
||||
@@ -1604,31 +1604,31 @@ func doCheckWarnMetricStatus(a *App, c *request.Context) {
|
||||
|
||||
warnMetrics := []model.WarnMetric{}
|
||||
|
||||
if numberOfActiveUsers < model.WARN_METRIC_NUMBER_OF_ACTIVE_USERS_25 {
|
||||
if numberOfActiveUsers < model.WarnMetricNumberOfActiveUsers25 {
|
||||
return
|
||||
} else if teamCount >= model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_TEAMS_5].Limit && warnMetricStatusFromStore[model.SYSTEM_WARN_METRIC_NUMBER_OF_TEAMS_5] != model.WARN_METRIC_STATUS_RUNONCE {
|
||||
warnMetrics = append(warnMetrics, model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_TEAMS_5])
|
||||
} else if *a.Config().ServiceSettings.EnableMultifactorAuthentication && warnMetricStatusFromStore[model.SYSTEM_WARN_METRIC_MFA] != model.WARN_METRIC_STATUS_RUNONCE {
|
||||
warnMetrics = append(warnMetrics, model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_MFA])
|
||||
} else if isDiffEmailAccount && warnMetricStatusFromStore[model.SYSTEM_WARN_METRIC_EMAIL_DOMAIN] != model.WARN_METRIC_STATUS_RUNONCE {
|
||||
warnMetrics = append(warnMetrics, model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_EMAIL_DOMAIN])
|
||||
} else if openChannelCount >= model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_CHANNELS_50].Limit && warnMetricStatusFromStore[model.SYSTEM_WARN_METRIC_NUMBER_OF_CHANNELS_50] != model.WARN_METRIC_STATUS_RUNONCE {
|
||||
warnMetrics = append(warnMetrics, model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_CHANNELS_50])
|
||||
} else if teamCount >= model.WarnMetricsTable[model.SystemWarnMetricNumberOfTeams5].Limit && warnMetricStatusFromStore[model.SystemWarnMetricNumberOfTeams5] != model.WarnMetricStatusRunonce {
|
||||
warnMetrics = append(warnMetrics, model.WarnMetricsTable[model.SystemWarnMetricNumberOfTeams5])
|
||||
} else if *a.Config().ServiceSettings.EnableMultifactorAuthentication && warnMetricStatusFromStore[model.SystemWarnMetricMfa] != model.WarnMetricStatusRunonce {
|
||||
warnMetrics = append(warnMetrics, model.WarnMetricsTable[model.SystemWarnMetricMfa])
|
||||
} else if isDiffEmailAccount && warnMetricStatusFromStore[model.SystemWarnMetricEmailDomain] != model.WarnMetricStatusRunonce {
|
||||
warnMetrics = append(warnMetrics, model.WarnMetricsTable[model.SystemWarnMetricEmailDomain])
|
||||
} else if openChannelCount >= model.WarnMetricsTable[model.SystemWarnMetricNumberOfChannels50].Limit && warnMetricStatusFromStore[model.SystemWarnMetricNumberOfChannels50] != model.WarnMetricStatusRunonce {
|
||||
warnMetrics = append(warnMetrics, model.WarnMetricsTable[model.SystemWarnMetricNumberOfChannels50])
|
||||
}
|
||||
|
||||
// If the system did not cross any of the thresholds for the Contextual Advisories
|
||||
if len(warnMetrics) == 0 {
|
||||
if numberOfActiveUsers >= model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_100].Limit && numberOfActiveUsers < model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_200].Limit && warnMetricStatusFromStore[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_100] != model.WARN_METRIC_STATUS_RUNONCE {
|
||||
warnMetrics = append(warnMetrics, model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_100])
|
||||
} else if numberOfActiveUsers >= model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_200].Limit && numberOfActiveUsers < model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_300].Limit && warnMetricStatusFromStore[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_200] != model.WARN_METRIC_STATUS_RUNONCE {
|
||||
warnMetrics = append(warnMetrics, model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_200])
|
||||
} else if numberOfActiveUsers >= model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_300].Limit && numberOfActiveUsers < model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500].Limit && warnMetricStatusFromStore[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_300] != model.WARN_METRIC_STATUS_RUNONCE {
|
||||
warnMetrics = append(warnMetrics, model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_300])
|
||||
} else if numberOfActiveUsers >= model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500].Limit {
|
||||
if numberOfActiveUsers >= model.WarnMetricsTable[model.SystemWarnMetricNumberOfActiveUsers100].Limit && numberOfActiveUsers < model.WarnMetricsTable[model.SystemWarnMetricNumberOfActiveUsers200].Limit && warnMetricStatusFromStore[model.SystemWarnMetricNumberOfActiveUsers100] != model.WarnMetricStatusRunonce {
|
||||
warnMetrics = append(warnMetrics, model.WarnMetricsTable[model.SystemWarnMetricNumberOfActiveUsers100])
|
||||
} else if numberOfActiveUsers >= model.WarnMetricsTable[model.SystemWarnMetricNumberOfActiveUsers200].Limit && numberOfActiveUsers < model.WarnMetricsTable[model.SystemWarnMetricNumberOfActiveUsers300].Limit && warnMetricStatusFromStore[model.SystemWarnMetricNumberOfActiveUsers200] != model.WarnMetricStatusRunonce {
|
||||
warnMetrics = append(warnMetrics, model.WarnMetricsTable[model.SystemWarnMetricNumberOfActiveUsers200])
|
||||
} else if numberOfActiveUsers >= model.WarnMetricsTable[model.SystemWarnMetricNumberOfActiveUsers300].Limit && numberOfActiveUsers < model.WarnMetricsTable[model.SystemWarnMetricNumberOfActiveUsers500].Limit && warnMetricStatusFromStore[model.SystemWarnMetricNumberOfActiveUsers300] != model.WarnMetricStatusRunonce {
|
||||
warnMetrics = append(warnMetrics, model.WarnMetricsTable[model.SystemWarnMetricNumberOfActiveUsers300])
|
||||
} else if numberOfActiveUsers >= model.WarnMetricsTable[model.SystemWarnMetricNumberOfActiveUsers500].Limit {
|
||||
var tWarnMetric model.WarnMetric
|
||||
|
||||
if warnMetricStatusFromStore[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500] != model.WARN_METRIC_STATUS_RUNONCE {
|
||||
tWarnMetric = model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_ACTIVE_USERS_500]
|
||||
if warnMetricStatusFromStore[model.SystemWarnMetricNumberOfActiveUsers500] != model.WarnMetricStatusRunonce {
|
||||
tWarnMetric = model.WarnMetricsTable[model.SystemWarnMetricNumberOfActiveUsers500]
|
||||
}
|
||||
|
||||
postsCount, err4 := a.Srv().Store.Post().AnalyticsPostCount("", false, false)
|
||||
@@ -1636,8 +1636,8 @@ func doCheckWarnMetricStatus(a *App, c *request.Context) {
|
||||
mlog.Debug("Error attempting to get number of posts.", mlog.Err(err4))
|
||||
}
|
||||
|
||||
if postsCount > model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_POSTS_2M].Limit && warnMetricStatusFromStore[model.SYSTEM_WARN_METRIC_NUMBER_OF_POSTS_2M] != model.WARN_METRIC_STATUS_RUNONCE {
|
||||
tWarnMetric = model.WarnMetricsTable[model.SYSTEM_WARN_METRIC_NUMBER_OF_POSTS_2M]
|
||||
if postsCount > model.WarnMetricsTable[model.SystemWarnMetricNumberOfPosts2m].Limit && warnMetricStatusFromStore[model.SystemWarnMetricNumberOfPosts2m] != model.WarnMetricStatusRunonce {
|
||||
tWarnMetric = model.WarnMetricsTable[model.SystemWarnMetricNumberOfPosts2m]
|
||||
}
|
||||
|
||||
if tWarnMetric != (model.WarnMetric{}) {
|
||||
@@ -1650,7 +1650,7 @@ func doCheckWarnMetricStatus(a *App, c *request.Context) {
|
||||
|
||||
for _, warnMetric := range warnMetrics {
|
||||
data, nErr := a.Srv().Store.System().GetByName(warnMetric.Id)
|
||||
if nErr == nil && data != nil && warnMetric.IsBotOnly && data.Value == model.WARN_METRIC_STATUS_RUNONCE {
|
||||
if nErr == nil && data != nil && warnMetric.IsBotOnly && data.Value == model.WarnMetricStatusRunonce {
|
||||
mlog.Debug("This metric warning is bot only and ran once")
|
||||
continue
|
||||
}
|
||||
@@ -1658,12 +1658,12 @@ func doCheckWarnMetricStatus(a *App, c *request.Context) {
|
||||
warnMetricStatus, _ := a.getWarnMetricStatusAndDisplayTextsForId(warnMetric.Id, nil, isE0Edition)
|
||||
if !warnMetric.IsBotOnly {
|
||||
// Banner and bot metric types - send websocket event every interval
|
||||
message := model.NewWebSocketEvent(model.WEBSOCKET_WARN_METRIC_STATUS_RECEIVED, "", "", "", nil)
|
||||
message := model.NewWebSocketEvent(model.WebsocketWarnMetricStatusReceived, "", "", "", nil)
|
||||
message.Add("warnMetricStatus", warnMetricStatus.ToJson())
|
||||
a.Publish(message)
|
||||
|
||||
// Banner and bot metric types, send the bot message only once
|
||||
if data != nil && data.Value == model.WARN_METRIC_STATUS_RUNONCE {
|
||||
if data != nil && data.Value == model.WarnMetricStatusRunonce {
|
||||
continue
|
||||
}
|
||||
}
|
||||
@@ -1673,9 +1673,9 @@ func doCheckWarnMetricStatus(a *App, c *request.Context) {
|
||||
}
|
||||
|
||||
if warnMetric.IsRunOnce {
|
||||
a.setWarnMetricsStatusForId(warnMetric.Id, model.WARN_METRIC_STATUS_RUNONCE)
|
||||
a.setWarnMetricsStatusForId(warnMetric.Id, model.WarnMetricStatusRunonce)
|
||||
} else {
|
||||
a.setWarnMetricsStatusForId(warnMetric.Id, model.WARN_METRIC_STATUS_LIMIT_REACHED)
|
||||
a.setWarnMetricsStatusForId(warnMetric.Id, model.WarnMetricStatusLimitReached)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1683,8 +1683,8 @@ func doCheckWarnMetricStatus(a *App, c *request.Context) {
|
||||
func doCheckAdminSupportStatus(a *App, c *request.Context) {
|
||||
isE0Edition := model.BuildEnterpriseReady == "true"
|
||||
|
||||
if strings.TrimSpace(*a.Config().SupportSettings.SupportEmail) == model.SUPPORT_SETTINGS_DEFAULT_SUPPORT_EMAIL {
|
||||
if err := a.notifyAdminsOfWarnMetricStatus(c, model.SYSTEM_METRIC_SUPPORT_EMAIL_NOT_CONFIGURED, isE0Edition); err != nil {
|
||||
if strings.TrimSpace(*a.Config().SupportSettings.SupportEmail) == model.SupportSettingsDefaultSupportEmail {
|
||||
if err := a.notifyAdminsOfWarnMetricStatus(c, model.SystemMetricSupportEmailNotConfigured, isE0Edition); err != nil {
|
||||
mlog.Error("Failed to send notifications to admin users.", mlog.Err(err))
|
||||
}
|
||||
}
|
||||
@@ -1791,7 +1791,7 @@ func (s *Server) startMetricsServer() {
|
||||
}
|
||||
|
||||
func (s *Server) sendLicenseUpForRenewalEmail(users map[string]*model.User, license *model.License) *model.AppError {
|
||||
key := model.LICENSE_UP_FOR_RENEWAL_EMAIL_SENT + license.Id
|
||||
key := model.LicenseUpForRenewalEmailSent + license.Id
|
||||
if _, err := s.Store.System().GetByName(key); err == nil {
|
||||
// return early because the key already exists and that means we already executed the code below to send email successfully
|
||||
return nil
|
||||
|
||||
Ссылка в новой задаче
Block a user