From edbcb247c61ad7fcc2e8f2bef8548b70cee0cf4c Mon Sep 17 00:00:00 2001 From: AulakhHarsh <115346020+AulakhHarsh@users.noreply.github.com> Date: Tue, 26 Nov 2024 20:52:31 +0530 Subject: [PATCH] Fix errcheck issues in server/channels/app/platform/log.go (#29349) Co-authored-by: Ben Schumacher --- server/.golangci.yml | 1 - server/channels/app/platform/log.go | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/server/.golangci.yml b/server/.golangci.yml index a6ea0088b1..c7cfd8712d 100644 --- a/server/.golangci.yml +++ b/server/.golangci.yml @@ -100,7 +100,6 @@ issues: channels/app/permissions_test.go|\ channels/app/platform/helper_test.go|\ channels/app/platform/license.go|\ - channels/app/platform/log.go|\ channels/app/platform/searchengine.go|\ channels/app/platform/service.go|\ channels/app/platform/service_test.go|\ diff --git a/server/channels/app/platform/log.go b/server/channels/app/platform/log.go index 0616755838..080250e26c 100644 --- a/server/channels/app/platform/log.go +++ b/server/channels/app/platform/log.go @@ -112,13 +112,17 @@ func (ps *PlatformService) RemoveUnlicensedLogTargets(license *model.License) { timeoutCtx, cancelCtx := context.WithTimeout(context.Background(), time.Second*10) defer cancelCtx() - ps.logger.RemoveTargets(timeoutCtx, func(ti mlog.TargetInfo) bool { + if err := ps.logger.RemoveTargets(timeoutCtx, func(ti mlog.TargetInfo) bool { return ti.Type != "*targets.Writer" && ti.Type != "*targets.File" - }) + }); err != nil { + mlog.Error("Failed to remove log targets", mlog.Err(err)) + } - ps.notificationsLogger.RemoveTargets(timeoutCtx, func(ti mlog.TargetInfo) bool { + if err := ps.notificationsLogger.RemoveTargets(timeoutCtx, func(ti mlog.TargetInfo) bool { return ti.Type != "*targets.Writer" && ti.Type != "*targets.File" - }) + }); err != nil { + mlog.Error("Failed to remove notification log targets", mlog.Err(err)) + } } func (ps *PlatformService) GetLogsSkipSend(rctx request.CTX, page, perPage int, logFilter *model.LogFilter) ([]string, *model.AppError) {