snapshot of https://github.com/mattermost/mattermost.git (master, 2026-09-16; blobs > 131072B omitted)
Some checks failed
Server CI / Postgres (shard 0) (push) Has been skipped
Server CI / Postgres (shard 3) (push) Has been skipped
BuildEnv Docker Image / build-image (push) Failing after 4s
BuildEnv Docker Image / build-image-fips (push) Failing after 4s
Migration Review & Release Notes / Generate migration review & release notes (push) Failing after 3s
Server CI / Build Environment (push) Failing after 3s
Server CI / Postgres (shard 1) (push) Has been skipped
Tools CI / check-style (mattermost-govet) (push) Failing after 4s
Server CI / Postgres (shard 2) (push) Has been skipped
Tools CI / check-style (mmgotool) (push) Failing after 3s
Server CI / Elasticsearch v8 Compatibility (push) Has been skipped
Server CI / OpenSearch v2 Compatibility (push) Has been skipped
Server CI / Postgres FIPS (shard 0) (push) Has been skipped
Tools CI / Test (mattermost-govet) (push) Failing after 3s
Server CI / Postgres FIPS (shard 1) (push) Has been skipped
Server CI / Postgres FIPS (shard 2) (push) Has been skipped
Tools CI / Test (mmgotool) (push) Failing after 3s
Server CI / Postgres FIPS (shard 3) (push) Has been skipped
Server CI / Run mmctl tests (push) Has been skipped
Server CI / Run mmctl tests (FIPS) (push) Has been skipped
Server CI / Merge Postgres Test Results (push) Has been skipped
Server CI / Merge Postgres FIPS Test Results (push) Has been skipped
Server CI / Check backport migrations (push) Has been skipped
Server CI / Check generated files (push) Has been skipped
Server CI / check-style (push) Has been skipped
Server CI / Vet API (push) Has been skipped
Server CI / Build mattermost server app (push) Has been skipped
Server CI / Server CI Complete (push) Failing after 2s
Server CI / Server CI Artifacts (push) Has been skipped
Server CI / Sentry Upload (push) Has been skipped
Server CI / Server CI Report (push) Failing after 5m1s
Server CI Nightly Race / Race Detector (push) Has been skipped
CodeQL / Analyze (go) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Webapp CI Cache Warm / Warm Webapp node_modules Cache (push) Has been cancelled
E2E CI Cache Warm / Warm E2E npm Registry Cache (push) Has been cancelled
API / build (push) Has been cancelled
Web App CI / check-types (push) Has been cancelled
Web App CI / check-lint (push) Has been cancelled
Web App CI / check-i18n (push) Has been cancelled
Web App CI / check-external-links (push) Has been cancelled
Web App CI / test (platform) (push) Has been cancelled
Web App CI / test (mattermost-redux) (push) Has been cancelled
Web App CI / test (channels shard 1/4) (push) Has been cancelled
Web App CI / test (channels shard 2/4) (push) Has been cancelled
Web App CI / test (channels shard 3/4) (push) Has been cancelled
Web App CI / test (channels shard 4/4) (push) Has been cancelled
Web App CI / upload-coverage (push) Has been cancelled
Web App CI / build (push) Has been cancelled
YAML Lint / yamllint (push) Has been cancelled
Push mirrored docker images / cd/Push mirrored docker images (push) Has been cancelled
docs-cd / Build and deploy docs (push) Has been cancelled
Docs CI / build (push) Has been cancelled
E2E Cache Warm: Cypress deps / Warm Cypress deps cache (push) Has been cancelled
Scorecards supply-chain security / Scorecard analysis (push) Has been cancelled
Server CI Weekly / Postgres FIPS (push) Has been skipped
Server CI Weekly / Run mmctl tests (FIPS) (push) Has been skipped
Server CI Weekly / Postgres with binary parameters (push) Has been skipped
Server CI Weekly / Build Environment (push) Failing after 1s
Server CI Cache Warm / Warm Go Module and Build Cache (push) Failing after 2s
Server CI Nightly Race / Build Environment (push) Failing after 1s
Some checks failed
Server CI / Postgres (shard 0) (push) Has been skipped
Server CI / Postgres (shard 3) (push) Has been skipped
BuildEnv Docker Image / build-image (push) Failing after 4s
BuildEnv Docker Image / build-image-fips (push) Failing after 4s
Migration Review & Release Notes / Generate migration review & release notes (push) Failing after 3s
Server CI / Build Environment (push) Failing after 3s
Server CI / Postgres (shard 1) (push) Has been skipped
Tools CI / check-style (mattermost-govet) (push) Failing after 4s
Server CI / Postgres (shard 2) (push) Has been skipped
Tools CI / check-style (mmgotool) (push) Failing after 3s
Server CI / Elasticsearch v8 Compatibility (push) Has been skipped
Server CI / OpenSearch v2 Compatibility (push) Has been skipped
Server CI / Postgres FIPS (shard 0) (push) Has been skipped
Tools CI / Test (mattermost-govet) (push) Failing after 3s
Server CI / Postgres FIPS (shard 1) (push) Has been skipped
Server CI / Postgres FIPS (shard 2) (push) Has been skipped
Tools CI / Test (mmgotool) (push) Failing after 3s
Server CI / Postgres FIPS (shard 3) (push) Has been skipped
Server CI / Run mmctl tests (push) Has been skipped
Server CI / Run mmctl tests (FIPS) (push) Has been skipped
Server CI / Merge Postgres Test Results (push) Has been skipped
Server CI / Merge Postgres FIPS Test Results (push) Has been skipped
Server CI / Check backport migrations (push) Has been skipped
Server CI / Check generated files (push) Has been skipped
Server CI / check-style (push) Has been skipped
Server CI / Vet API (push) Has been skipped
Server CI / Build mattermost server app (push) Has been skipped
Server CI / Server CI Complete (push) Failing after 2s
Server CI / Server CI Artifacts (push) Has been skipped
Server CI / Sentry Upload (push) Has been skipped
Server CI / Server CI Report (push) Failing after 5m1s
Server CI Nightly Race / Race Detector (push) Has been skipped
CodeQL / Analyze (go) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Webapp CI Cache Warm / Warm Webapp node_modules Cache (push) Has been cancelled
E2E CI Cache Warm / Warm E2E npm Registry Cache (push) Has been cancelled
API / build (push) Has been cancelled
Web App CI / check-types (push) Has been cancelled
Web App CI / check-lint (push) Has been cancelled
Web App CI / check-i18n (push) Has been cancelled
Web App CI / check-external-links (push) Has been cancelled
Web App CI / test (platform) (push) Has been cancelled
Web App CI / test (mattermost-redux) (push) Has been cancelled
Web App CI / test (channels shard 1/4) (push) Has been cancelled
Web App CI / test (channels shard 2/4) (push) Has been cancelled
Web App CI / test (channels shard 3/4) (push) Has been cancelled
Web App CI / test (channels shard 4/4) (push) Has been cancelled
Web App CI / upload-coverage (push) Has been cancelled
Web App CI / build (push) Has been cancelled
YAML Lint / yamllint (push) Has been cancelled
Push mirrored docker images / cd/Push mirrored docker images (push) Has been cancelled
docs-cd / Build and deploy docs (push) Has been cancelled
Docs CI / build (push) Has been cancelled
E2E Cache Warm: Cypress deps / Warm Cypress deps cache (push) Has been cancelled
Scorecards supply-chain security / Scorecard analysis (push) Has been cancelled
Server CI Weekly / Postgres FIPS (push) Has been skipped
Server CI Weekly / Run mmctl tests (FIPS) (push) Has been skipped
Server CI Weekly / Postgres with binary parameters (push) Has been skipped
Server CI Weekly / Build Environment (push) Failing after 1s
Server CI Cache Warm / Warm Go Module and Build Cache (push) Failing after 2s
Server CI Nightly Race / Build Environment (push) Failing after 1s
This commit is contained in:
@@ -0,0 +1,97 @@
|
||||
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
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
// Copyright (c) 2019-present Mattermost, Inc. All Rights Reserved.
|
||||
// See License for license information.
|
||||
|
||||
package logger
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"maps"
|
||||
"time"
|
||||
|
||||
"github.com/mattermost/mattermost/server/public/pluginapi/experimental/common"
|
||||
)
|
||||
|
||||
type defaultLogger struct {
|
||||
logContext LogContext
|
||||
logAPI common.LogAPI
|
||||
}
|
||||
|
||||
/*
|
||||
New creates a new logger.
|
||||
|
||||
- api: LogAPI implementation
|
||||
*/
|
||||
func New(api common.LogAPI) Logger {
|
||||
l := &defaultLogger{
|
||||
logAPI: api,
|
||||
}
|
||||
return l
|
||||
}
|
||||
|
||||
func (l *defaultLogger) With(logContext LogContext) Logger {
|
||||
newLogger := *l
|
||||
if len(newLogger.logContext) == 0 {
|
||||
newLogger.logContext = map[string]any{}
|
||||
}
|
||||
maps.Copy(newLogger.logContext, logContext)
|
||||
return &newLogger
|
||||
}
|
||||
|
||||
func (l *defaultLogger) WithError(err error) Logger {
|
||||
newLogger := *l
|
||||
if len(newLogger.logContext) == 0 {
|
||||
newLogger.logContext = map[string]any{}
|
||||
}
|
||||
newLogger.logContext[ErrorKey] = err.Error()
|
||||
return &newLogger
|
||||
}
|
||||
|
||||
func (l *defaultLogger) Context() LogContext {
|
||||
return l.logContext
|
||||
}
|
||||
|
||||
func (l *defaultLogger) Timed() Logger {
|
||||
return l.With(LogContext{
|
||||
timed: time.Now(),
|
||||
})
|
||||
}
|
||||
|
||||
func (l *defaultLogger) Debugf(format string, args ...any) {
|
||||
measure(l.logContext)
|
||||
message := fmt.Sprintf(format, args...)
|
||||
l.logAPI.LogDebug(message, toKeyValuePairs(l.logContext)...)
|
||||
}
|
||||
|
||||
func (l *defaultLogger) Errorf(format string, args ...any) {
|
||||
measure(l.logContext)
|
||||
message := fmt.Sprintf(format, args...)
|
||||
l.logAPI.LogError(message, toKeyValuePairs(l.logContext)...)
|
||||
}
|
||||
|
||||
func (l *defaultLogger) Infof(format string, args ...any) {
|
||||
measure(l.logContext)
|
||||
message := fmt.Sprintf(format, args...)
|
||||
l.logAPI.LogInfo(message, toKeyValuePairs(l.logContext)...)
|
||||
}
|
||||
|
||||
func (l *defaultLogger) Warnf(format string, args ...any) {
|
||||
measure(l.logContext)
|
||||
message := fmt.Sprintf(format, args...)
|
||||
l.logAPI.LogWarn(message, toKeyValuePairs(l.logContext)...)
|
||||
}
|
||||
78
server/public/pluginapi/experimental/bot/logger/logger.go
Normal file
78
server/public/pluginapi/experimental/bot/logger/logger.go
Normal file
@@ -0,0 +1,78 @@
|
||||
package logger
|
||||
|
||||
import "time"
|
||||
|
||||
const (
|
||||
timed = "__since"
|
||||
elapsed = "Elapsed"
|
||||
|
||||
ErrorKey = "error"
|
||||
)
|
||||
|
||||
// LogLevel defines the level of log messages
|
||||
type LogLevel string
|
||||
|
||||
const (
|
||||
// LogLevelDebug denotes debug messages
|
||||
LogLevelDebug = "debug"
|
||||
// LogLevelInfo denotes info messages
|
||||
LogLevelInfo = "info"
|
||||
// LogLevelWarn denotes warn messages
|
||||
LogLevelWarn = "warn"
|
||||
// LogLevelError denotes error messages
|
||||
LogLevelError = "error"
|
||||
)
|
||||
|
||||
// LogContext defines the context for the logs.
|
||||
type LogContext map[string]any
|
||||
|
||||
// Logger defines an object able to log messages.
|
||||
type Logger interface {
|
||||
// With adds a logContext to the logger.
|
||||
With(LogContext) Logger
|
||||
// WithError adds an Error to the logger.
|
||||
WithError(error) Logger
|
||||
// Context returns the current context
|
||||
Context() LogContext
|
||||
// Timed add a timed log context.
|
||||
Timed() Logger
|
||||
// Debugf logs a formatted string as a debug message.
|
||||
Debugf(format string, args ...any)
|
||||
// Errorf logs a formatted string as an error message.
|
||||
Errorf(format string, args ...any)
|
||||
// Infof logs a formatted string as an info message.
|
||||
Infof(format string, args ...any)
|
||||
// Warnf logs a formatted string as an warning message.
|
||||
Warnf(format string, args ...any)
|
||||
}
|
||||
|
||||
func measure(lc LogContext) {
|
||||
if lc[timed] == nil {
|
||||
return
|
||||
}
|
||||
started := lc[timed].(time.Time)
|
||||
lc[elapsed] = time.Since(started).String()
|
||||
delete(lc, timed)
|
||||
}
|
||||
|
||||
// Level assigns an integer to the LogLevel string
|
||||
func Level(l LogLevel) int {
|
||||
switch l {
|
||||
case LogLevelDebug:
|
||||
return 4
|
||||
case LogLevelInfo:
|
||||
return 3
|
||||
case LogLevelWarn:
|
||||
return 2
|
||||
case LogLevelError:
|
||||
return 1
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
func toKeyValuePairs(in map[string]any) (out []any) {
|
||||
for k, v := range in {
|
||||
out = append(out, k, v)
|
||||
}
|
||||
return out
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package logger
|
||||
|
||||
type nilLogger struct{}
|
||||
|
||||
// NewNilLogger returns a logger that performs no action.
|
||||
func NewNilLogger() Logger {
|
||||
return &nilLogger{}
|
||||
}
|
||||
|
||||
func (l *nilLogger) With(LogContext) Logger { return l }
|
||||
func (l *nilLogger) WithError(error) Logger { return l }
|
||||
func (l *nilLogger) Context() LogContext { return nil }
|
||||
func (l *nilLogger) Timed() Logger { return l }
|
||||
func (l *nilLogger) Debugf(string, ...any) {}
|
||||
func (l *nilLogger) Errorf(string, ...any) {}
|
||||
func (l *nilLogger) Infof(string, ...any) {}
|
||||
func (l *nilLogger) Warnf(string, ...any) {}
|
||||
@@ -0,0 +1,60 @@
|
||||
package logger
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"maps"
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
type testLogger struct {
|
||||
testing.TB
|
||||
logContext LogContext
|
||||
}
|
||||
|
||||
// NewTestLogger creates a logger for testing purposes.
|
||||
func NewTestLogger() Logger {
|
||||
return &testLogger{}
|
||||
}
|
||||
|
||||
func (l *testLogger) With(logContext LogContext) Logger {
|
||||
newl := *l
|
||||
if len(newl.logContext) == 0 {
|
||||
newl.logContext = map[string]any{}
|
||||
}
|
||||
maps.Copy(newl.logContext, logContext)
|
||||
return &newl
|
||||
}
|
||||
|
||||
func (l *testLogger) WithError(err error) Logger {
|
||||
newl := *l
|
||||
if len(newl.logContext) == 0 {
|
||||
newl.logContext = map[string]any{}
|
||||
}
|
||||
newl.logContext[ErrorKey] = err.Error()
|
||||
return &newl
|
||||
}
|
||||
|
||||
func (l *testLogger) Context() LogContext {
|
||||
return l.logContext
|
||||
}
|
||||
|
||||
func (l *testLogger) Timed() Logger {
|
||||
return l.With(LogContext{
|
||||
timed: time.Now(),
|
||||
})
|
||||
}
|
||||
|
||||
func (l *testLogger) logf(prefix, format string, args ...any) {
|
||||
out := fmt.Sprintf(prefix+": "+format, args...)
|
||||
if len(l.logContext) > 0 {
|
||||
measure(l.logContext)
|
||||
out += fmt.Sprintf(" -- %+v", l.logContext)
|
||||
}
|
||||
l.TB.Log(out)
|
||||
}
|
||||
|
||||
func (l *testLogger) Debugf(format string, args ...any) { l.logf("DEBUG", format, args...) }
|
||||
func (l *testLogger) Errorf(format string, args ...any) { l.logf("ERROR", format, args...) }
|
||||
func (l *testLogger) Infof(format string, args ...any) { l.logf("INFO", format, args...) }
|
||||
func (l *testLogger) Warnf(format string, args ...any) { l.logf("WARN", format, args...) }
|
||||
Reference in New Issue
Block a user