Skip to content

Commit b7b1ffc

Browse files
authored
Revert verbosity level check (#452)
1 parent 317f251 commit b7b1ffc

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

logging/zap/grpclogger.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,5 +133,7 @@ func (l *zapGrpcLoggerV2) Fatalf(format string, args ...interface{}) {
133133
}
134134

135135
func (l *zapGrpcLoggerV2) V(level int) bool {
136-
return l.verbosity <= level
136+
// Check whether the verbosity of the current log ('level') is within the specified threshold ('l.verbosity').
137+
// As in https://github.com/grpc/grpc-go/blob/41e044e1c82fcf6a5801d6cbd7ecf952505eecb1/grpclog/loggerv2.go#L199-L201.
138+
return level <= l.verbosity
137139
}

logging/zap/grpclogger_test.go

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,26 @@ import (
1414
)
1515

1616
func Test_zapGrpcLogger_V(t *testing.T) {
17-
// copied from gRPC
1817
const (
19-
// infoLog indicates Info severity.
20-
infoLog int = iota
21-
// warningLog indicates Warning severity.
22-
warningLog
23-
// errorLog indicates Error severity.
24-
errorLog
25-
// fatalLog indicates Fatal severity.
26-
fatalLog
18+
// The default verbosity level.
19+
// See https://github.com/grpc/grpc-go/blob/8ab16ef276a33df4cdb106446eeff40ff56a6928/grpclog/loggerv2.go#L108.
20+
normal = 0
21+
22+
// Currently the only level of "being verbose".
23+
// For example https://github.com/grpc/grpc-go/blob/8ab16ef276a33df4cdb106446eeff40ff56a6928/grpclog/grpclog.go#L21.
24+
verbose = 2
25+
26+
// As is mentioned in https://github.com/grpc/grpc-go/blob/8ab16ef276a33df4cdb106446eeff40ff56a6928/README.md#how-to-turn-on-logging,
27+
// though currently not being used in the code.
28+
extremelyVerbose = 99
2729
)
2830

2931
core, _ := observer.New(zapcore.DebugLevel)
3032
logger := zap.New(core)
31-
ReplaceGrpcLoggerV2WithVerbosity(logger, warningLog)
32-
assert.False(t, grpclog.V(infoLog))
33-
assert.True(t, grpclog.V(warningLog))
34-
assert.True(t, grpclog.V(errorLog))
35-
assert.True(t, grpclog.V(fatalLog))
33+
ReplaceGrpcLoggerV2WithVerbosity(logger, verbose)
34+
assert.True(t, grpclog.V(normal))
35+
assert.True(t, grpclog.V(verbose))
36+
assert.False(t, grpclog.V(extremelyVerbose))
3637
}
3738

3839
func TestReplaceGrpcLoggerV2(t *testing.T) {

0 commit comments

Comments
 (0)