Browse Source

pkg/logger: type-assert in global-scope

Rather than asserting inside functions.

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>
Gyuho Lee 8 years ago
parent
commit
0e43d84f14
2 changed files with 7 additions and 5 deletions
  1. 3 0
      pkg/logger/discard.go
  2. 4 5
      pkg/logger/package_logger.go

+ 3 - 0
pkg/logger/discard.go

@@ -16,6 +16,9 @@ package logger
 
 
 import "log"
 import "log"
 
 
+// assert that Logger satisfies grpclog.LoggerV2
+var _ Logger = &discardLogger{}
+
 // NewDiscardLogger returns a new Logger that discards everything except "fatal".
 // NewDiscardLogger returns a new Logger that discards everything except "fatal".
 func NewDiscardLogger() Logger { return &discardLogger{} }
 func NewDiscardLogger() Logger { return &discardLogger{} }
 
 

+ 4 - 5
pkg/logger/package_logger.go

@@ -16,6 +16,9 @@ package logger
 
 
 import "github.com/coreos/pkg/capnslog"
 import "github.com/coreos/pkg/capnslog"
 
 
+// assert that Logger satisfies grpclog.LoggerV2
+var _ Logger = &packageLogger{}
+
 // NewPackageLogger wraps "*capnslog.PackageLogger" that implements "Logger" interface.
 // NewPackageLogger wraps "*capnslog.PackageLogger" that implements "Logger" interface.
 //
 //
 // For example:
 // For example:
@@ -24,11 +27,7 @@ import "github.com/coreos/pkg/capnslog"
 //  plog := capnslog.NewPackageLogger("github.com/coreos/etcd", "snapshot")
 //  plog := capnslog.NewPackageLogger("github.com/coreos/etcd", "snapshot")
 //  defaultLogger = NewPackageLogger(plog)
 //  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 {
 type packageLogger struct {
 	p *capnslog.PackageLogger
 	p *capnslog.PackageLogger