[MM-54850] Use request-specific logger in channels/app/admin_advisor.go (#24859)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
3dd9e3715c
Коммит
eb35e83152
@@ -472,7 +472,7 @@ func (a *App) doLocalWarnMetricsRequest(c *request.Context, rawURL string, upstr
|
||||
}
|
||||
|
||||
isE0Edition := (model.BuildEnterpriseReady == "true") // license == nil was already validated upstream
|
||||
_, warnMetricDisplayTexts := a.getWarnMetricStatusAndDisplayTextsForId(warnMetricId, i18n.T, isE0Edition)
|
||||
_, warnMetricDisplayTexts := a.getWarnMetricStatusAndDisplayTextsForId(c, warnMetricId, i18n.T, isE0Edition)
|
||||
botPost.Message = ":white_check_mark: " + warnMetricDisplayTexts.BotSuccessMessage
|
||||
|
||||
if isE0Edition {
|
||||
@@ -481,11 +481,11 @@ func (a *App) doLocalWarnMetricsRequest(c *request.Context, rawURL string, upstr
|
||||
}
|
||||
} else {
|
||||
forceAck := upstreamRequest.Context["force_ack"].(bool)
|
||||
if appErr = a.NotifyAndSetWarnMetricAck(warnMetricId, user, forceAck, true); appErr != nil {
|
||||
if appErr = a.NotifyAndSetWarnMetricAck(c, warnMetricId, user, forceAck, true); appErr != nil {
|
||||
if forceAck {
|
||||
return appErr
|
||||
}
|
||||
mailtoLinkText := a.buildWarnMetricMailtoLink(warnMetricId, user)
|
||||
mailtoLinkText := a.buildWarnMetricMailtoLink(c, warnMetricId, user)
|
||||
botPost.Message = ":warning: " + i18n.T("api.server.warn_metric.bot_response.notification_failure.message")
|
||||
actions := []*model.PostAction{}
|
||||
actions = append(actions,
|
||||
@@ -542,9 +542,9 @@ func (mlc *MailToLinkContent) ToJSON() string {
|
||||
return string(b)
|
||||
}
|
||||
|
||||
func (a *App) buildWarnMetricMailtoLink(warnMetricId string, user *model.User) string {
|
||||
func (a *App) buildWarnMetricMailtoLink(rctx request.CTX, warnMetricId string, user *model.User) string {
|
||||
T := i18n.GetUserTranslations(user.Locale)
|
||||
_, warnMetricDisplayTexts := a.getWarnMetricStatusAndDisplayTextsForId(warnMetricId, T, false)
|
||||
_, warnMetricDisplayTexts := a.getWarnMetricStatusAndDisplayTextsForId(rctx, warnMetricId, T, false)
|
||||
|
||||
mailBody := warnMetricDisplayTexts.EmailBody
|
||||
mailBody += T("api.server.warn_metric.bot_response.mailto_contact_header", map[string]any{"Contact": user.GetFullName()})
|
||||
|
||||
Ссылка в новой задаче
Block a user