From 0e43d84f149ac3f2bc13d43dd0d0fbc642baa8ab Mon Sep 17 00:00:00 2001 From: Gyuho Lee Date: Mon, 22 Jan 2018 14:50:46 -0800 Subject: [PATCH] pkg/logger: type-assert in global-scope Rather than asserting inside functions. Signed-off-by: Gyuho Lee --- pkg/logger/discard.go | 3 +++ pkg/logger/package_logger.go | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkg/logger/discard.go b/pkg/logger/discard.go index e1ae119ce..bda2fbc91 100644 --- a/pkg/logger/discard.go +++ b/pkg/logger/discard.go @@ -16,6 +16,9 @@ package logger import "log" +// assert that Logger satisfies grpclog.LoggerV2 +var _ Logger = &discardLogger{} + // NewDiscardLogger returns a new Logger that discards everything except "fatal". func NewDiscardLogger() Logger { return &discardLogger{} } diff --git a/pkg/logger/package_logger.go b/pkg/logger/package_logger.go index 98d440b8b..8d645f499 100644 --- a/pkg/logger/package_logger.go +++ b/pkg/logger/package_logger.go @@ -16,6 +16,9 @@ package logger import "github.com/coreos/pkg/capnslog" +// assert that Logger satisfies grpclog.LoggerV2 +var _ Logger = &packageLogger{} + // NewPackageLogger wraps "*capnslog.PackageLogger" that implements "Logger" interface. // // For example: @@ -24,11 +27,7 @@ import "github.com/coreos/pkg/capnslog" // plog := capnslog.NewPackageLogger("github.com/coreos/etcd", "snapshot") // defaultLogger = NewPackageLogger(plog) // -func NewPackageLogger(p *capnslog.PackageLogger) Logger { - // assert that Logger satisfies grpclog.LoggerV2 - var _ Logger = &packageLogger{} - return &packageLogger{p: p} -} +func NewPackageLogger(p *capnslog.PackageLogger) Logger { return &packageLogger{p: p} } type packageLogger struct { p *capnslog.PackageLogger