Fix possible nil dereference (#15435)
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
9a4774bcc2
Коммит
1e34bdac1f
@@ -26,11 +26,15 @@ func (s *Server) GetLogs(page, perPage int) ([]string, *model.AppError) {
|
|||||||
|
|
||||||
license := s.License()
|
license := s.License()
|
||||||
if license != nil && *license.Features.Cluster && s.Cluster != nil && *s.Config().ClusterSettings.Enable {
|
if license != nil && *license.Features.Cluster && s.Cluster != nil && *s.Config().ClusterSettings.Enable {
|
||||||
|
if info := s.Cluster.GetMyClusterInfo(); info != nil {
|
||||||
lines = append(lines, "-----------------------------------------------------------------------------------------------------------")
|
lines = append(lines, "-----------------------------------------------------------------------------------------------------------")
|
||||||
lines = append(lines, "-----------------------------------------------------------------------------------------------------------")
|
lines = append(lines, "-----------------------------------------------------------------------------------------------------------")
|
||||||
lines = append(lines, s.Cluster.GetMyClusterInfo().Hostname)
|
lines = append(lines, info.Hostname)
|
||||||
lines = append(lines, "-----------------------------------------------------------------------------------------------------------")
|
lines = append(lines, "-----------------------------------------------------------------------------------------------------------")
|
||||||
lines = append(lines, "-----------------------------------------------------------------------------------------------------------")
|
lines = append(lines, "-----------------------------------------------------------------------------------------------------------")
|
||||||
|
} else {
|
||||||
|
mlog.Error("Could not get cluster info")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
melines, err := s.GetLogsSkipSend(page, perPage)
|
melines, err := s.GetLogsSkipSend(page, perPage)
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user