Sebastiaan van Stijn
373fa57edc
- full diff: https://github.com/containerd/containerd/compare/v1.6.21...v1.6.22 - release notes: https://github.com/containerd/containerd/releases/tag/v1.6.22 --- Notable Updates - RunC: Update runc binary to v1.1.8 - CRI: Fix `additionalGids`: it should fallback to `imageConfig.User` when `securityContext.RunAsUser`, `RunAsUsername` are empty - CRI: Write generated CNI config atomically - Fix concurrent writes for `UpdateContainerStats` - Make `checkContainerTimestamps` less strict on Windows - Port-Forward: Correctly handle known errors - Resolve `docker.NewResolver` race condition - SecComp: Always allow `name_to_handle_at` - Adding support to run hcsshim from local clone - Pinned image support - Runtime/V2/RunC: Handle early exits w/o big locks - CRITool: Move up to CRI-TOOLS v1.27.0 - Fix cpu architecture detection issue on emulated ARM platform - Task: Don't `close()` io before `cancel()` - Fix panic when remote differ returns empty result - Plugins: Notify readiness when registered plugins are ready - Unwrap io errors in server connection receive error handling Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
121 lines
2.8 KiB
Go
121 lines
2.8 KiB
Go
/*
|
|
Copyright The containerd Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package log
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
var (
|
|
// G is an alias for GetLogger.
|
|
//
|
|
// We may want to define this locally to a package to get package tagged log
|
|
// messages.
|
|
G = GetLogger
|
|
|
|
// L is an alias for the standard logger.
|
|
L = logrus.NewEntry(logrus.StandardLogger())
|
|
)
|
|
|
|
type (
|
|
loggerKey struct{}
|
|
|
|
// Fields type to pass to `WithFields`, alias from `logrus`.
|
|
Fields = logrus.Fields
|
|
|
|
// Level is a logging level
|
|
Level = logrus.Level
|
|
)
|
|
|
|
const (
|
|
// RFC3339NanoFixed is time.RFC3339Nano with nanoseconds padded using zeros to
|
|
// ensure the formatted time is always the same number of characters.
|
|
RFC3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00"
|
|
|
|
// TextFormat represents the text logging format
|
|
TextFormat = "text"
|
|
|
|
// JSONFormat represents the JSON logging format
|
|
JSONFormat = "json"
|
|
|
|
// TraceLevel level.
|
|
TraceLevel = logrus.TraceLevel
|
|
|
|
// DebugLevel level.
|
|
DebugLevel = logrus.DebugLevel
|
|
|
|
// InfoLevel level.
|
|
InfoLevel = logrus.InfoLevel
|
|
)
|
|
|
|
// SetLevel sets log level globally.
|
|
func SetLevel(level string) error {
|
|
lvl, err := logrus.ParseLevel(level)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
logrus.SetLevel(lvl)
|
|
return nil
|
|
}
|
|
|
|
// GetLevel returns the current log level.
|
|
func GetLevel() Level {
|
|
return logrus.GetLevel()
|
|
}
|
|
|
|
// SetFormat sets log output format
|
|
func SetFormat(format string) error {
|
|
switch format {
|
|
case TextFormat:
|
|
logrus.SetFormatter(&logrus.TextFormatter{
|
|
TimestampFormat: RFC3339NanoFixed,
|
|
FullTimestamp: true,
|
|
})
|
|
case JSONFormat:
|
|
logrus.SetFormatter(&logrus.JSONFormatter{
|
|
TimestampFormat: RFC3339NanoFixed,
|
|
})
|
|
default:
|
|
return fmt.Errorf("unknown log format: %s", format)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// WithLogger returns a new context with the provided logger. Use in
|
|
// combination with logger.WithField(s) for great effect.
|
|
func WithLogger(ctx context.Context, logger *logrus.Entry) context.Context {
|
|
e := logger.WithContext(ctx)
|
|
return context.WithValue(ctx, loggerKey{}, e)
|
|
}
|
|
|
|
// GetLogger retrieves the current logger from the context. If no logger is
|
|
// available, the default logger is returned.
|
|
func GetLogger(ctx context.Context) *logrus.Entry {
|
|
logger := ctx.Value(loggerKey{})
|
|
|
|
if logger == nil {
|
|
return L.WithContext(ctx)
|
|
}
|
|
|
|
return logger.(*logrus.Entry)
|
|
}
|