From 3816b6fde565720ac09177d30fb63d718dca8692 Mon Sep 17 00:00:00 2001 From: Cao Shufeng Date: Sun, 4 Jun 2017 16:15:28 +0800 Subject: [PATCH] Remove extra empty lines from log remove extra "\n" from Everything() --- staging/src/k8s.io/apiserver/pkg/audit/format.go | 2 +- staging/src/k8s.io/apiserver/pkg/audit/metrics.go | 2 +- staging/src/k8s.io/apiserver/plugin/pkg/audit/log/backend.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/audit/format.go b/staging/src/k8s.io/apiserver/pkg/audit/format.go index 79c6ae7f04c..62076d695c5 100644 --- a/staging/src/k8s.io/apiserver/pkg/audit/format.go +++ b/staging/src/k8s.io/apiserver/pkg/audit/format.go @@ -60,7 +60,7 @@ func EventString(ev *auditinternal.Event) string { ip = ev.SourceIPs[0] } - return fmt.Sprintf("%s AUDIT: id=%q stage=%q ip=%q method=%q user=%q groups=%q as=%q asgroups=%q namespace=%q uri=%q response=\"%s\"\n", + return fmt.Sprintf("%s AUDIT: id=%q stage=%q ip=%q method=%q user=%q groups=%q as=%q asgroups=%q namespace=%q uri=%q response=\"%s\"", ev.Timestamp.Format(time.RFC3339Nano), ev.AuditID, ev.Stage, ip, ev.Verb, username, groups, asuser, asgroups, namespace, ev.RequestURI, response) } diff --git a/staging/src/k8s.io/apiserver/pkg/audit/metrics.go b/staging/src/k8s.io/apiserver/pkg/audit/metrics.go index 1701332fab6..db2280e3167 100644 --- a/staging/src/k8s.io/apiserver/pkg/audit/metrics.go +++ b/staging/src/k8s.io/apiserver/pkg/audit/metrics.go @@ -72,7 +72,7 @@ func ObservePolicyLevel(level auditinternal.Level) { // HandlePluginError handles an error that occurred in an audit plugin. This method should only be // used if the error may have prevented the audit event from being properly recorded. The events are -// modified. +// logged to the debug log. func HandlePluginError(plugin string, err error, impacted ...*auditinternal.Event) { // Count the error. errorCounter.WithLabelValues(plugin).Add(float64(len(impacted))) diff --git a/staging/src/k8s.io/apiserver/plugin/pkg/audit/log/backend.go b/staging/src/k8s.io/apiserver/plugin/pkg/audit/log/backend.go index 702599785ef..9f381806d5f 100644 --- a/staging/src/k8s.io/apiserver/plugin/pkg/audit/log/backend.go +++ b/staging/src/k8s.io/apiserver/plugin/pkg/audit/log/backend.go @@ -47,7 +47,7 @@ func (b *backend) ProcessEvents(events ...*auditinternal.Event) { func (b *backend) logEvent(ev *auditinternal.Event) { line := audit.EventString(ev) - if _, err := fmt.Fprint(b.out, line); err != nil { + if _, err := fmt.Fprintln(b.out, line); err != nil { audit.HandlePluginError("log", err, ev) } }