Fixed errcheck issues in server/channels/app/server.go (#29425)
Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
f1da465454
Коммит
d2b334e605
@@ -100,7 +100,6 @@ issues:
|
|||||||
channels/app/plugin_test.go|\
|
channels/app/plugin_test.go|\
|
||||||
channels/app/post_helpers_test.go|\
|
channels/app/post_helpers_test.go|\
|
||||||
channels/app/post_test.go|\
|
channels/app/post_test.go|\
|
||||||
channels/app/server.go|\
|
|
||||||
channels/app/slack.go|\
|
channels/app/slack.go|\
|
||||||
channels/app/slashcommands/auto_environment.go|\
|
channels/app/slashcommands/auto_environment.go|\
|
||||||
channels/app/slashcommands/command_test.go|\
|
channels/app/slashcommands/command_test.go|\
|
||||||
|
|||||||
@@ -242,7 +242,9 @@ func NewServer(options ...Option) (*Server, error) {
|
|||||||
// It is important to initialize the hub only after the global logger is set
|
// It is important to initialize the hub only after the global logger is set
|
||||||
// to avoid race conditions while logging from inside the hub.
|
// to avoid race conditions while logging from inside the hub.
|
||||||
// Step 4: Start platform
|
// Step 4: Start platform
|
||||||
s.platform.Start(s.makeBroadcastHooks())
|
if err = s.platform.Start(s.makeBroadcastHooks()); err != nil {
|
||||||
|
return nil, errors.Wrap(err, "failed to start platform")
|
||||||
|
}
|
||||||
|
|
||||||
// NOTE: There should be no call to App.Srv().Channels() before step 5 is done
|
// NOTE: There should be no call to App.Srv().Channels() before step 5 is done
|
||||||
// otherwise it will throw a panic.
|
// otherwise it will throw a panic.
|
||||||
@@ -495,7 +497,9 @@ func NewServer(options ...Option) (*Server, error) {
|
|||||||
(oldCfg.ImageProxySettings.ImageProxyType != newCfg.ImageProxySettings.ImageProxyType) ||
|
(oldCfg.ImageProxySettings.ImageProxyType != newCfg.ImageProxySettings.ImageProxyType) ||
|
||||||
(oldCfg.ImageProxySettings.RemoteImageProxyURL != newCfg.ImageProxySettings.RemoteImageProxyURL) ||
|
(oldCfg.ImageProxySettings.RemoteImageProxyURL != newCfg.ImageProxySettings.RemoteImageProxyURL) ||
|
||||||
(oldCfg.ImageProxySettings.RemoteImageProxyOptions != newCfg.ImageProxySettings.RemoteImageProxyOptions) {
|
(oldCfg.ImageProxySettings.RemoteImageProxyOptions != newCfg.ImageProxySettings.RemoteImageProxyOptions) {
|
||||||
s.openGraphDataCache.Purge()
|
if err = s.openGraphDataCache.Purge(); err != nil {
|
||||||
|
mlog.Error("Failed to purge Open Graph data cache after config change", mlog.Err(err))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -517,10 +521,12 @@ func (s *Server) runJobs() {
|
|||||||
runSecurityJob(s)
|
runSecurityJob(s)
|
||||||
})
|
})
|
||||||
s.Go(func() {
|
s.Go(func() {
|
||||||
firstRun, err := s.getFirstServerRunTimestamp()
|
firstRun, appErr := s.getFirstServerRunTimestamp()
|
||||||
if err != nil {
|
if appErr != nil {
|
||||||
mlog.Warn("Fetching time of first server run failed. Setting to 'now'.")
|
mlog.Warn("Fetching time of first server run failed. Setting to 'now'.")
|
||||||
s.ensureFirstServerRunTimestamp()
|
if err := s.ensureFirstServerRunTimestamp(); err != nil {
|
||||||
|
mlog.Error("Failed to set first server run timestamp to current time", mlog.Err(err))
|
||||||
|
}
|
||||||
firstRun = utils.MillisFromTime(time.Now())
|
firstRun = utils.MillisFromTime(time.Now())
|
||||||
}
|
}
|
||||||
s.telemetryService.RunTelemetryJob(firstRun)
|
s.telemetryService.RunTelemetryJob(firstRun)
|
||||||
@@ -712,7 +718,9 @@ func (s *Server) Shutdown() {
|
|||||||
|
|
||||||
s.platform.StopSearchEngine()
|
s.platform.StopSearchEngine()
|
||||||
|
|
||||||
s.Audit.Shutdown()
|
if err = s.Audit.Shutdown(); err != nil {
|
||||||
|
s.Log().Warn("Failed to shut down audit", mlog.Err(err))
|
||||||
|
}
|
||||||
|
|
||||||
s.platform.StopFeatureFlagUpdateJob()
|
s.platform.StopFeatureFlagUpdateJob()
|
||||||
|
|
||||||
@@ -798,7 +806,9 @@ func (s *Server) UpgradeToE0() error {
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
upgradedFromTE := &model.System{Name: model.SystemUpgradedFromTeId, Value: "true"}
|
upgradedFromTE := &model.System{Name: model.SystemUpgradedFromTeId, Value: "true"}
|
||||||
s.Store().System().Save(upgradedFromTE)
|
if err := s.Store().System().Save(upgradedFromTE); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -888,7 +898,9 @@ func (s *Server) Start() error {
|
|||||||
|
|
||||||
s.checkPushNotificationServerURL()
|
s.checkPushNotificationServerURL()
|
||||||
|
|
||||||
s.platform.ReloadConfig()
|
if err = s.platform.ReloadConfig(); err != nil {
|
||||||
|
mlog.Error("Failed to reload config on server start", mlog.Err(err))
|
||||||
|
}
|
||||||
|
|
||||||
mlog.Info("Starting Server...")
|
mlog.Info("Starting Server...")
|
||||||
|
|
||||||
@@ -987,7 +999,11 @@ func (s *Server) Start() error {
|
|||||||
Handler: m.HTTPHandler(nil),
|
Handler: m.HTTPHandler(nil),
|
||||||
ErrorLog: s.Log().With(mlog.String("source", "le_forwarder_server")).StdLogger(mlog.LvlError),
|
ErrorLog: s.Log().With(mlog.String("source", "le_forwarder_server")).StdLogger(mlog.LvlError),
|
||||||
}
|
}
|
||||||
go server.ListenAndServe()
|
go func() {
|
||||||
|
if err := server.ListenAndServe(); err != nil {
|
||||||
|
mlog.Error("Failed to serve redirect from port 80 to 443 with autocert ", mlog.Err(err))
|
||||||
|
}
|
||||||
|
}()
|
||||||
} else {
|
} else {
|
||||||
go func() {
|
go func() {
|
||||||
redirectListener, err := net.Listen("tcp", httpListenAddress)
|
redirectListener, err := net.Listen("tcp", httpListenAddress)
|
||||||
@@ -1001,7 +1017,9 @@ func (s *Server) Start() error {
|
|||||||
Handler: http.HandlerFunc(handleHTTPRedirect),
|
Handler: http.HandlerFunc(handleHTTPRedirect),
|
||||||
ErrorLog: s.Log().With(mlog.String("source", "forwarder_server")).StdLogger(mlog.LvlError),
|
ErrorLog: s.Log().With(mlog.String("source", "forwarder_server")).StdLogger(mlog.LvlError),
|
||||||
}
|
}
|
||||||
server.Serve(redirectListener)
|
if err := server.Serve(redirectListener); err != nil {
|
||||||
|
mlog.Error("Failed to serve redirect from port 80 to 443", mlog.Err(err))
|
||||||
|
}
|
||||||
}()
|
}()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1240,7 +1258,9 @@ func doReportUsageToAWSMeteringService(s *Server) {
|
|||||||
|
|
||||||
dimensions := []string{model.AwsMeteringDimensionUsageHrs}
|
dimensions := []string{model.AwsMeteringDimensionUsageHrs}
|
||||||
reports := awsMeter.GetUserCategoryUsage(dimensions, time.Now().UTC(), time.Now().Add(-model.AwsMeteringReportInterval*time.Hour).UTC())
|
reports := awsMeter.GetUserCategoryUsage(dimensions, time.Now().UTC(), time.Now().Add(-model.AwsMeteringReportInterval*time.Hour).UTC())
|
||||||
awsMeter.ReportUserCategoryUsage(reports)
|
if err := awsMeter.ReportUserCategoryUsage(reports); err != nil {
|
||||||
|
mlog.Error("Failed to report usage to AWS Metering Service", mlog.Err(err))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func doSecurity(s *Server) {
|
func doSecurity(s *Server) {
|
||||||
@@ -1434,8 +1454,10 @@ func (s *Server) doLicenseExpirationCheck() {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove the license
|
//remove the license
|
||||||
s.RemoveLicense()
|
if appErr := s.RemoveLicense(); appErr != nil {
|
||||||
|
mlog.Error("Error while removing the license.", mlog.Err(appErr))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// SendRemoveExpiredLicenseEmail formats an email and uses the email service to send the email to user with link pointing to CWS
|
// SendRemoveExpiredLicenseEmail formats an email and uses the email service to send the email to user with link pointing to CWS
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user