Merge pull request #9196 from gyuho/log

pkg/logger: type-assert in global-scope
etcd-io · Jan 22, 2018 · 962505f · 962505f
2 parents ea814d2 + 0e43d84
commit 962505f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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