mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
a38d8b0730
Full diff: https://github.com/sirupsen/logrus/compare/v1.3.0...v1.4.1 Fixes: - Remove dependency on golang.org/x/crypto - Fix wrong method calls Logger.Print and Logger.Warningln - Update Entry.Logf to not do string formatting unless the log level is enabled - Fix infinite recursion on unknown Level.String() - Fix race condition in getCaller - Fix Entry.WithContext method to return a copy of the initial entry New: - Add DeferExitHandler, similar to RegisterExitHandler but prepending the handler to the list of handlers (semantically like defer) - Add CallerPrettyfier to JSONFormatter and `TextFormatter` - Add Entry.WithContext() and Entry.Context, to set a context on entries to be used e.g. in hooks - Enhance TextFormatter to not print caller information when they are empty Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
76 lines
2.7 KiB
Go
76 lines
2.7 KiB
Go
package logrus
|
|
|
|
// The following code was sourced and modified from the
|
|
// https://github.com/tebeka/atexit package governed by the following license:
|
|
//
|
|
// Copyright (c) 2012 Miki Tebeka <miki.tebeka@gmail.com>.
|
|
//
|
|
// Permission is hereby granted, free of charge, to any person obtaining a copy of
|
|
// this software and associated documentation files (the "Software"), to deal in
|
|
// the Software without restriction, including without limitation the rights to
|
|
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
|
// the Software, and to permit persons to whom the Software is furnished to do so,
|
|
// subject to the following conditions:
|
|
//
|
|
// The above copyright notice and this permission notice shall be included in all
|
|
// copies or substantial portions of the Software.
|
|
//
|
|
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
|
// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
|
// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
|
// IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
)
|
|
|
|
var handlers = []func(){}
|
|
|
|
func runHandler(handler func()) {
|
|
defer func() {
|
|
if err := recover(); err != nil {
|
|
fmt.Fprintln(os.Stderr, "Error: Logrus exit handler error:", err)
|
|
}
|
|
}()
|
|
|
|
handler()
|
|
}
|
|
|
|
func runHandlers() {
|
|
for _, handler := range handlers {
|
|
runHandler(handler)
|
|
}
|
|
}
|
|
|
|
// Exit runs all the Logrus atexit handlers and then terminates the program using os.Exit(code)
|
|
func Exit(code int) {
|
|
runHandlers()
|
|
os.Exit(code)
|
|
}
|
|
|
|
// RegisterExitHandler appends a Logrus Exit handler to the list of handlers,
|
|
// call logrus.Exit to invoke all handlers. The handlers will also be invoked when
|
|
// any Fatal log entry is made.
|
|
//
|
|
// This method is useful when a caller wishes to use logrus to log a fatal
|
|
// message but also needs to gracefully shutdown. An example usecase could be
|
|
// closing database connections, or sending a alert that the application is
|
|
// closing.
|
|
func RegisterExitHandler(handler func()) {
|
|
handlers = append(handlers, handler)
|
|
}
|
|
|
|
// DeferExitHandler prepends a Logrus Exit handler to the list of handlers,
|
|
// call logrus.Exit to invoke all handlers. The handlers will also be invoked when
|
|
// any Fatal log entry is made.
|
|
//
|
|
// This method is useful when a caller wishes to use logrus to log a fatal
|
|
// message but also needs to gracefully shutdown. An example usecase could be
|
|
// closing database connections, or sending a alert that the application is
|
|
// closing.
|
|
func DeferExitHandler(handler func()) {
|
|
handlers = append([]func(){handler}, handlers...)
|
|
}
|