summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/mattermost/mattermost-server/mlog
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/mattermost/mattermost-server/mlog')
-rw-r--r--vendor/github.com/mattermost/mattermost-server/mlog/default.go50
-rw-r--r--vendor/github.com/mattermost/mattermost-server/mlog/global.go44
-rw-r--r--vendor/github.com/mattermost/mattermost-server/mlog/log.go173
-rw-r--r--vendor/github.com/mattermost/mattermost-server/mlog/stdlog.go87
-rw-r--r--vendor/github.com/mattermost/mattermost-server/mlog/sugar.go28
5 files changed, 0 insertions, 382 deletions
diff --git a/vendor/github.com/mattermost/mattermost-server/mlog/default.go b/vendor/github.com/mattermost/mattermost-server/mlog/default.go
deleted file mode 100644
index 366d22f8..00000000
--- a/vendor/github.com/mattermost/mattermost-server/mlog/default.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-package mlog
-
-import (
- "encoding/json"
- "fmt"
-)
-
-// defaultLog manually encodes the log to STDOUT, providing a basic, default logging implementation
-// before mlog is fully configured.
-func defaultLog(level, msg string, fields ...Field) {
- log := struct {
- Level string `json:"level"`
- Message string `json:"msg"`
- Fields []Field `json:"fields,omitempty"`
- }{
- level,
- msg,
- fields,
- }
-
- if b, err := json.Marshal(log); err != nil {
- fmt.Printf(`{"level":"error","msg":"failed to encode log message"}%s`, "\n")
- } else {
- fmt.Printf("%s\n", b)
- }
-}
-
-func defaultDebugLog(msg string, fields ...Field) {
- defaultLog("debug", msg, fields...)
-}
-
-func defaultInfoLog(msg string, fields ...Field) {
- defaultLog("info", msg, fields...)
-}
-
-func defaultWarnLog(msg string, fields ...Field) {
- defaultLog("warn", msg, fields...)
-}
-
-func defaultErrorLog(msg string, fields ...Field) {
- defaultLog("error", msg, fields...)
-}
-
-func defaultCriticalLog(msg string, fields ...Field) {
- // We map critical to error in zap, so be consistent.
- defaultLog("error", msg, fields...)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/mlog/global.go b/vendor/github.com/mattermost/mattermost-server/mlog/global.go
deleted file mode 100644
index ba90ace2..00000000
--- a/vendor/github.com/mattermost/mattermost-server/mlog/global.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-package mlog
-
-import (
- "go.uber.org/zap"
- "go.uber.org/zap/zapcore"
-)
-
-var globalLogger *Logger
-
-func InitGlobalLogger(logger *Logger) {
- glob := *logger
- glob.zap = glob.zap.WithOptions(zap.AddCallerSkip(1))
- globalLogger = &glob
- Debug = globalLogger.Debug
- Info = globalLogger.Info
- Warn = globalLogger.Warn
- Error = globalLogger.Error
- Critical = globalLogger.Critical
-}
-
-func RedirectStdLog(logger *Logger) {
- zap.RedirectStdLogAt(logger.zap.With(zap.String("source", "stdlog")).WithOptions(zap.AddCallerSkip(-2)), zapcore.ErrorLevel)
-}
-
-type LogFunc func(string, ...Field)
-
-// DON'T USE THIS Modify the level on the app logger
-func GloballyDisableDebugLogForTest() {
- globalLogger.consoleLevel.SetLevel(zapcore.ErrorLevel)
-}
-
-// DON'T USE THIS Modify the level on the app logger
-func GloballyEnableDebugLogForTest() {
- globalLogger.consoleLevel.SetLevel(zapcore.DebugLevel)
-}
-
-var Debug LogFunc = defaultDebugLog
-var Info LogFunc = defaultInfoLog
-var Warn LogFunc = defaultWarnLog
-var Error LogFunc = defaultErrorLog
-var Critical LogFunc = defaultCriticalLog
diff --git a/vendor/github.com/mattermost/mattermost-server/mlog/log.go b/vendor/github.com/mattermost/mattermost-server/mlog/log.go
deleted file mode 100644
index e3bc38d8..00000000
--- a/vendor/github.com/mattermost/mattermost-server/mlog/log.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-package mlog
-
-import (
- "io"
- "log"
- "os"
-
- "go.uber.org/zap"
- "go.uber.org/zap/zapcore"
- "gopkg.in/natefinch/lumberjack.v2"
-)
-
-const (
- // Very verbose messages for debugging specific issues
- LevelDebug = "debug"
- // Default log level, informational
- LevelInfo = "info"
- // Warnings are messages about possible issues
- LevelWarn = "warn"
- // Errors are messages about things we know are problems
- LevelError = "error"
-)
-
-// Type and function aliases from zap to limit the libraries scope into MM code
-type Field = zapcore.Field
-
-var Int64 = zap.Int64
-var Int = zap.Int
-var Uint32 = zap.Uint32
-var String = zap.String
-var Any = zap.Any
-var Err = zap.Error
-var Bool = zap.Bool
-
-type LoggerConfiguration struct {
- EnableConsole bool
- ConsoleJson bool
- ConsoleLevel string
- EnableFile bool
- FileJson bool
- FileLevel string
- FileLocation string
-}
-
-type Logger struct {
- zap *zap.Logger
- consoleLevel zap.AtomicLevel
- fileLevel zap.AtomicLevel
-}
-
-func getZapLevel(level string) zapcore.Level {
- switch level {
- case LevelInfo:
- return zapcore.InfoLevel
- case LevelWarn:
- return zapcore.WarnLevel
- case LevelDebug:
- return zapcore.DebugLevel
- case LevelError:
- return zapcore.ErrorLevel
- default:
- return zapcore.InfoLevel
- }
-}
-
-func makeEncoder(json bool) zapcore.Encoder {
- encoderConfig := zap.NewProductionEncoderConfig()
- if json {
- return zapcore.NewJSONEncoder(encoderConfig)
- }
-
- encoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
- return zapcore.NewConsoleEncoder(encoderConfig)
-}
-
-func NewLogger(config *LoggerConfiguration) *Logger {
- cores := []zapcore.Core{}
- logger := &Logger{
- consoleLevel: zap.NewAtomicLevelAt(getZapLevel(config.ConsoleLevel)),
- fileLevel: zap.NewAtomicLevelAt(getZapLevel(config.FileLevel)),
- }
-
- if config.EnableConsole {
- writer := zapcore.Lock(os.Stdout)
- core := zapcore.NewCore(makeEncoder(config.ConsoleJson), writer, logger.consoleLevel)
- cores = append(cores, core)
- }
-
- if config.EnableFile {
- writer := zapcore.AddSync(&lumberjack.Logger{
- Filename: config.FileLocation,
- MaxSize: 100,
- Compress: true,
- })
- core := zapcore.NewCore(makeEncoder(config.FileJson), writer, logger.fileLevel)
- cores = append(cores, core)
- }
-
- combinedCore := zapcore.NewTee(cores...)
-
- logger.zap = zap.New(combinedCore,
- zap.AddCallerSkip(1),
- zap.AddCaller(),
- )
-
- return logger
-}
-
-func (l *Logger) ChangeLevels(config *LoggerConfiguration) {
- l.consoleLevel.SetLevel(getZapLevel(config.ConsoleLevel))
- l.fileLevel.SetLevel(getZapLevel(config.FileLevel))
-}
-
-func (l *Logger) SetConsoleLevel(level string) {
- l.consoleLevel.SetLevel(getZapLevel(level))
-}
-
-func (l *Logger) With(fields ...Field) *Logger {
- newlogger := *l
- newlogger.zap = newlogger.zap.With(fields...)
- return &newlogger
-}
-
-func (l *Logger) StdLog(fields ...Field) *log.Logger {
- return zap.NewStdLog(l.With(fields...).zap.WithOptions(getStdLogOption()))
-}
-
-// StdLogWriter returns a writer that can be hooked up to the output of a golang standard logger
-// anything written will be interpreted as log entries accordingly
-func (l *Logger) StdLogWriter() io.Writer {
- newLogger := *l
- newLogger.zap = newLogger.zap.WithOptions(zap.AddCallerSkip(4), getStdLogOption())
- f := newLogger.Info
- return &loggerWriter{f}
-}
-
-func (l *Logger) WithCallerSkip(skip int) *Logger {
- newlogger := *l
- newlogger.zap = newlogger.zap.WithOptions(zap.AddCallerSkip(skip))
- return &newlogger
-}
-
-// Made for the plugin interface, wraps mlog in a simpler interface
-// at the cost of performance
-func (l *Logger) Sugar() *SugarLogger {
- return &SugarLogger{
- wrappedLogger: l,
- zapSugar: l.zap.Sugar(),
- }
-}
-
-func (l *Logger) Debug(message string, fields ...Field) {
- l.zap.Debug(message, fields...)
-}
-
-func (l *Logger) Info(message string, fields ...Field) {
- l.zap.Info(message, fields...)
-}
-
-func (l *Logger) Warn(message string, fields ...Field) {
- l.zap.Warn(message, fields...)
-}
-
-func (l *Logger) Error(message string, fields ...Field) {
- l.zap.Error(message, fields...)
-}
-
-func (l *Logger) Critical(message string, fields ...Field) {
- l.zap.Error(message, fields...)
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/mlog/stdlog.go b/vendor/github.com/mattermost/mattermost-server/mlog/stdlog.go
deleted file mode 100644
index 7839ddfa..00000000
--- a/vendor/github.com/mattermost/mattermost-server/mlog/stdlog.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-package mlog
-
-import (
- "bytes"
- "strings"
-
- "go.uber.org/zap"
- "go.uber.org/zap/zapcore"
-)
-
-// Implementation of zapcore.Core to interpret log messages from a standard logger
-// and translate the levels to zapcore levels.
-type stdLogLevelInterpreterCore struct {
- wrappedCore zapcore.Core
-}
-
-func stdLogInterpretZapEntry(entry zapcore.Entry) zapcore.Entry {
- message := entry.Message
- if strings.Index(message, "[DEBUG]") == 0 {
- entry.Level = zapcore.DebugLevel
- entry.Message = message[7:]
- } else if strings.Index(message, "[DEBG]") == 0 {
- entry.Level = zapcore.DebugLevel
- entry.Message = message[6:]
- } else if strings.Index(message, "[WARN]") == 0 {
- entry.Level = zapcore.WarnLevel
- entry.Message = message[6:]
- } else if strings.Index(message, "[ERROR]") == 0 {
- entry.Level = zapcore.ErrorLevel
- entry.Message = message[7:]
- } else if strings.Index(message, "[EROR]") == 0 {
- entry.Level = zapcore.ErrorLevel
- entry.Message = message[6:]
- } else if strings.Index(message, "[ERR]") == 0 {
- entry.Level = zapcore.ErrorLevel
- entry.Message = message[5:]
- } else if strings.Index(message, "[INFO]") == 0 {
- entry.Level = zapcore.InfoLevel
- entry.Message = message[6:]
- }
- return entry
-}
-
-func (s *stdLogLevelInterpreterCore) Enabled(lvl zapcore.Level) bool {
- return s.wrappedCore.Enabled(lvl)
-}
-
-func (s *stdLogLevelInterpreterCore) With(fields []zapcore.Field) zapcore.Core {
- return s.wrappedCore.With(fields)
-}
-
-func (s *stdLogLevelInterpreterCore) Check(entry zapcore.Entry, checkedEntry *zapcore.CheckedEntry) *zapcore.CheckedEntry {
- entry = stdLogInterpretZapEntry(entry)
- return s.wrappedCore.Check(entry, checkedEntry)
-}
-
-func (s *stdLogLevelInterpreterCore) Write(entry zapcore.Entry, fields []zapcore.Field) error {
- entry = stdLogInterpretZapEntry(entry)
- return s.wrappedCore.Write(entry, fields)
-}
-
-func (s *stdLogLevelInterpreterCore) Sync() error {
- return s.wrappedCore.Sync()
-}
-
-func getStdLogOption() zap.Option {
- return zap.WrapCore(
- func(core zapcore.Core) zapcore.Core {
- return &stdLogLevelInterpreterCore{core}
- },
- )
-}
-
-type loggerWriter struct {
- logFunc func(msg string, fields ...Field)
-}
-
-func (l *loggerWriter) Write(p []byte) (int, error) {
- trimmed := string(bytes.TrimSpace(p))
- for _, line := range strings.Split(trimmed, "\n") {
- l.logFunc(string(line))
- }
- return len(p), nil
-}
diff --git a/vendor/github.com/mattermost/mattermost-server/mlog/sugar.go b/vendor/github.com/mattermost/mattermost-server/mlog/sugar.go
deleted file mode 100644
index c00a8bbf..00000000
--- a/vendor/github.com/mattermost/mattermost-server/mlog/sugar.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
-// See LICENSE.txt for license information.
-
-package mlog
-
-import "go.uber.org/zap"
-
-// Made for the plugin interface, use the regular logger for other uses
-type SugarLogger struct {
- wrappedLogger *Logger
- zapSugar *zap.SugaredLogger
-}
-
-func (l *SugarLogger) Debug(msg string, keyValuePairs ...interface{}) {
- l.zapSugar.Debugw(msg, keyValuePairs...)
-}
-
-func (l *SugarLogger) Info(msg string, keyValuePairs ...interface{}) {
- l.zapSugar.Infow(msg, keyValuePairs...)
-}
-
-func (l *SugarLogger) Error(msg string, keyValuePairs ...interface{}) {
- l.zapSugar.Errorw(msg, keyValuePairs...)
-}
-
-func (l *SugarLogger) Warn(msg string, keyValuePairs ...interface{}) {
- l.zapSugar.Warnw(msg, keyValuePairs...)
-}