extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2025-08-09 15:14:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

logger: write internal / outlet errors to an error outlet

Browse Source 
refs #28
This commit is contained in:
Christian Schwarz
2017-11-16 23:49:47 +01:00
parent f5ead68586
commit a7f70a566d
4 changed files with 69 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
logger/logger.go
View File

@ -3,7 +3,6 @@ package logger
import (
"context"
"fmt"
"os"
"runtime/debug"
"sync"
"time"
@ -15,17 +14,16 @@ const (
)
const DefaultUserFieldCapacity = 5
const InternalErrorPrefix = "github.com/zrepl/zrepl/logger: "
type Logger struct {
fields Fields
outlets Outlets
outlets *Outlets
outletTimeout time.Duration
mtx *sync.Mutex
}
func NewLogger(outlets Outlets, outletTimeout time.Duration) *Logger {
func NewLogger(outlets *Outlets, outletTimeout time.Duration) *Logger {
return &Logger{
make(Fields, DefaultUserFieldCapacity),
outlets,
@ -34,6 +32,29 @@ func NewLogger(outlets Outlets, outletTimeout time.Duration) *Logger {
}
}
type outletResult struct {
Outlet Outlet
Error error
}
func (l *Logger) logInternalError(outlet Outlet, err string) {
fields := Fields{}
if outlet != nil {
if _, ok := outlet.(fmt.Stringer); ok {
fields["outlet"] = fmt.Sprintf("%s", outlet)
}
fields["outlet_type"] = fmt.Sprintf("%T", outlet)
}
fields[FieldError] = err
entry := Entry{
Error,
"outlet error",
time.Now(),
fields,
}
l.outlets.GetLoggerErrorOutlet().WriteEntry(context.Background(), entry)
}
func (l *Logger) log(level Level, msg string) {
l.mtx.Lock()
@ -42,24 +63,24 @@ func (l *Logger) log(level Level, msg string) {
entry := Entry{level, msg, time.Now(), l.fields}
ctx, cancel := context.WithDeadline(context.Background(), time.Now().Add(l.outletTimeout))
ech := make(chan error)
ech := make(chan outletResult)
louts := l.outlets[level]
louts := l.outlets.Get(level)
for i := range louts {
go func(ctx context.Context, outlet Outlet, entry Entry) {
ech <- outlet.WriteEntry(ctx, entry)
ech <- outletResult{outlet, outlet.WriteEntry(ctx, entry)}
}(ctx, louts[i], entry)
}
for fin := 0; fin < len(louts); fin++ {
select {
case err := <-ech:
if err != nil {
fmt.Fprintf(os.Stderr, "%s outlet error: %s\n", InternalErrorPrefix, err)
case res := <-ech:
if res.Error != nil {
l.logInternalError(res.Outlet, res.Error.Error())
}
case <-ctx.Done():
if ctx.Err() == context.DeadlineExceeded {
fmt.Fprintf(os.Stderr, "%s outlets exceeded deadline, keep waiting anyways", InternalErrorPrefix)
l.logInternalError(nil, "one or more outlets exceeded timeout but will keep waiting anyways")
}
}
}
@ -74,7 +95,8 @@ func (l *Logger) WithField(field string, val interface{}) *Logger {
defer l.mtx.Unlock()
if _, ok := l.fields[field]; ok {
fmt.Fprintf(os.Stderr, "%s caller overwrites field '%s'. Stack:\n%s\n", InternalErrorPrefix, field, string(debug.Stack()))
l.logInternalError(nil,
fmt.Sprintf("caller overwrites field '%s'. Stack: %s", field, string(debug.Stack())))
}
child := &Logger{