mirror of
https://github.com/mattermost/mattermost.git
synced 2026-05-26 03:22:20 -04:00
e3fbf8711f
* MM-68149: upgrade to Go 1.26.2 Update go directive in go.mod and .go-version. * MM-68149: replace pointer helpers with Go 1.26 new() Go 1.26 extends the built-in new() to accept an initial value expression, making typed-pointer helpers like model.NewPointer(x), bToP(x), and boolPtr(x) redundant. Replace every call site with new(x) and remove the now-unused helper functions and their //go:fix inline directives. * MM-68149: apply go fix for reflect API and format-string changes - reflect.Ptr → reflect.Pointer (renamed in Go 1.18, deprecated alias removed in 1.26) - reflect range-over-struct: for i := 0; i < t.NumField(); i++ → for field := range t.Fields() and the equivalent for Methods() and interface types - Fix format-string concatenation and variadic-arg mismatches flagged by go vet * MM-68149: update JPEG fixtures and test infrastructure for Go 1.26 encoder Go 1.26 ships a new image/jpeg encoder that produces slightly different output. Regenerate all JPEG fixture files and switch the comparison helpers from byte-equality to pixel-level comparison with a small per-channel tolerance, so minor encoder drift across patch versions is handled automatically. Add -update-fixtures flag to make it easy to regenerate fixtures after future major Go upgrades. Document the update procedure in tests/README.md. * MM-68149: CI check that go fix ./... produces no changes * Fix real bugs flagged by CodeRabbit review - group.go: set newGroup.MemberCount not group.MemberCount (member count was populated on the wrong variable and lost before publish/return) - file_test.go: guard compareImage(GetFilePreview) on the preview slice length, not the thumbnail slice length (copy-paste error) - config_test.go: remove duplicate MinimumLength assignment * fixup! Fix real bugs flagged by CodeRabbit review
97 lines
2.7 KiB
Go
97 lines
2.7 KiB
Go
package admincclogger
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/mattermost/mattermost/server/public/pluginapi/experimental/bot/logger"
|
|
"github.com/mattermost/mattermost/server/public/pluginapi/experimental/bot/poster"
|
|
"github.com/mattermost/mattermost/server/public/pluginapi/experimental/common"
|
|
)
|
|
|
|
type adminCCLogger struct {
|
|
logger.Logger
|
|
dmer poster.DMer
|
|
logLevel logger.LogLevel
|
|
includeContext bool
|
|
userIDs []string
|
|
}
|
|
|
|
/*
|
|
New promotes the provided logger into a admin cc logger, sending direct messages to all the admin
|
|
ids provided through the dmer provided, about all events below the logLevel. If logVerbose is set,
|
|
it will also send the context.
|
|
|
|
- l Logger: A logger to promote.
|
|
|
|
- dmer DMer: A DMer to send the messages to the admins.
|
|
|
|
- logLevel: The highest type of message to be stored in telemetry.
|
|
|
|
- includeContext: Whether the log context should be messaged to the admins.
|
|
|
|
- userIDs: The user IDs of the admins.
|
|
*/
|
|
func New(l logger.Logger, dmer poster.DMer, logLevel logger.LogLevel, includeContext bool, userIDs ...string) logger.Logger {
|
|
return &adminCCLogger{
|
|
Logger: l,
|
|
dmer: dmer,
|
|
logLevel: logLevel,
|
|
includeContext: includeContext,
|
|
userIDs: userIDs,
|
|
}
|
|
}
|
|
|
|
// NewFromAPI creates a adminCCLogger directly from a LogAPI instead of passing a logger.
|
|
func NewFromAPI(api common.LogAPI, dmer poster.DMer, logLevel logger.LogLevel, includeContext bool, userIDs ...string) logger.Logger {
|
|
return New(logger.New(api), dmer, logLevel, includeContext, userIDs...)
|
|
}
|
|
|
|
func (l *adminCCLogger) Debugf(format string, args ...any) {
|
|
l.Logger.Debugf(format, args...)
|
|
message := fmt.Sprintf(format, args...)
|
|
if logger.Level(l.logLevel) >= 4 {
|
|
l.logToAdmins("DEBUG", message)
|
|
}
|
|
}
|
|
|
|
func (l *adminCCLogger) Errorf(format string, args ...any) {
|
|
l.Logger.Errorf(format, args...)
|
|
message := fmt.Sprintf(format, args...)
|
|
if logger.Level(l.logLevel) >= 1 {
|
|
l.logToAdmins("ERROR", message)
|
|
}
|
|
}
|
|
|
|
func (l *adminCCLogger) Infof(format string, args ...any) {
|
|
l.Logger.Infof(format, args...)
|
|
message := fmt.Sprintf(format, args...)
|
|
if logger.Level(l.logLevel) >= 3 {
|
|
l.logToAdmins("INFO", message)
|
|
}
|
|
}
|
|
|
|
func (l *adminCCLogger) Warnf(format string, args ...any) {
|
|
l.Logger.Warnf(format, args...)
|
|
message := fmt.Sprintf(format, args...)
|
|
if logger.Level(l.logLevel) >= 2 {
|
|
l.logToAdmins("WARN", message)
|
|
}
|
|
}
|
|
|
|
func (l *adminCCLogger) logToAdmins(level, message string) {
|
|
context := l.Context()
|
|
if l.includeContext && len(context) > 0 {
|
|
message += "\n" + common.JSONBlock(context)
|
|
}
|
|
_ = l.dmAdmins("(log %s) %s", level, message)
|
|
}
|
|
|
|
func (l *adminCCLogger) dmAdmins(format string, args ...any) error {
|
|
for _, id := range l.userIDs {
|
|
_, err := l.dmer.DM(id, format, args...)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
return nil
|
|
}
|