[MM-54435] Use annotated logger to capture compliance export logs (#24791)

Этот коммит содержится в:
Ben Schumacher
2023-10-23 10:20:32 +02:00
коммит произвёл GitHub
родитель fe6131caed
Коммит d0c22aa1cd
7 изменённых файлов: 35 добавлений и 13 удалений

Просмотреть файл

@@ -10,6 +10,7 @@ import (
"github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/public/shared/mlog"
"github.com/mattermost/mattermost/server/public/shared/request"
"github.com/mattermost/mattermost/server/v8/channels/store"
)
@@ -26,13 +27,15 @@ func (a *App) GetComplianceReports(page, perPage int) (model.Compliances, *model
return compliances, nil
}
func (a *App) SaveComplianceReport(job *model.Compliance) (*model.Compliance, *model.AppError) {
func (a *App) SaveComplianceReport(rctx request.CTX, job *model.Compliance) (*model.Compliance, *model.AppError) {
if license := a.Srv().License(); !*a.Config().ComplianceSettings.Enable || license == nil || !*license.Features.Compliance || a.Compliance() == nil {
return nil, model.NewAppError("saveComplianceReport", "ent.compliance.licence_disable.app_error", nil, "", http.StatusNotImplemented)
}
job.Type = model.ComplianceTypeAdhoc
rctx.SetLogger(rctx.Logger().With(job.LoggerFields()...))
job, err := a.Srv().Store().Compliance().Save(job)
if err != nil {
var appErr *model.AppError
@@ -45,10 +48,11 @@ func (a *App) SaveComplianceReport(job *model.Compliance) (*model.Compliance, *m
}
jCopy := job.DeepCopy()
crctx := rctx.Clone()
a.Srv().Go(func() {
err := a.Compliance().RunComplianceJob(jCopy)
err := a.Compliance().RunComplianceJob(crctx, jCopy)
if err != nil {
mlog.Warn("Error running compliance job", mlog.Err(err))
crctx.Logger().Warn("Error running compliance job", mlog.Err(err))
}
})