From ba46ee5dfa0bb5357924ec450c0613fa5fa9105d Mon Sep 17 00:00:00 2001 From: Sveinn Date: Tue, 2 Apr 2024 17:56:14 -0500 Subject: [PATCH] Adding console targets back into systemtarget log slice (#19398) --- internal/logger/logger.go | 6 ++---- internal/logger/targets.go | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/internal/logger/logger.go b/internal/logger/logger.go index bb02f80d0..91f1c072a 100644 --- a/internal/logger/logger.go +++ b/internal/logger/logger.go @@ -395,8 +395,7 @@ func logIf(ctx context.Context, err error, errKind ...interface{}) { if err == nil { return } - entry := errToEntry(ctx, err, errKind...) - sendLog(ctx, entry) + sendLog(ctx, errToEntry(ctx, err, errKind...)) } func sendLog(ctx context.Context, entry log.Entry) { @@ -421,8 +420,7 @@ func Event(ctx context.Context, msg string, args ...interface{}) { if DisableErrorLog { return } - entry := logToEntry(ctx, fmt.Sprintf(msg, args...), EventKind) - sendLog(ctx, entry) + sendLog(ctx, logToEntry(ctx, fmt.Sprintf(msg, args...), EventKind)) } // ErrCritical is the value panic'd whenever CriticalIf is called. diff --git a/internal/logger/targets.go b/internal/logger/targets.go index be66479a6..2c8b293df 100644 --- a/internal/logger/targets.go +++ b/internal/logger/targets.go @@ -192,8 +192,8 @@ func updateHTTPTargets(ctx context.Context, cfgs map[string]http.Config, targetL } } - oldTargets := make([]Target, len(*targetList)) - copy(oldTargets, *targetList) + oldTargets, others := splitTargets(*targetList, types.TargetHTTP) + newWebhooks = append(newWebhooks, others...) for i := range oldTargets { currentTgt, ok := oldTargets[i].(*http.Target)