Skip to content

Commit a481157

Browse files
committed
revert to use number verbosity
1 parent 04a97e6 commit a481157

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

cmd/bbr/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ var (
4949
"metrics-port", 9090, "The metrics port")
5050
streaming = flag.Bool(
5151
"streaming", false, "Enables streaming support for Envoy full-duplex streaming mode")
52-
logVerbosity = flag.String("log-level", logging.DefaultLogLevel, "log level verbosity, support: debug, info, warn, error, dpanic, panic, fatal")
52+
logVerbosity = flag.Int("log-verbosity", logging.DEFAULT, "number for the log level verbosity, higher verbosity means more (and less important) logs will be generated")
5353

5454
setupLog = ctrl.Log.WithName("setup")
5555
)

cmd/epp/runner/runner.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import (
4444
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
4545

4646
"sigs.k8s.io/gateway-api-inference-extension/internal/runnable"
47+
"sigs.k8s.io/gateway-api-inference-extension/internal/telemetry/logging"
4748
"sigs.k8s.io/gateway-api-inference-extension/pkg/common"
4849
backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics"
4950
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/config/loader"
@@ -63,7 +64,6 @@ import (
6364
testfilter "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/framework/plugins/test/filter"
6465
runserver "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/server"
6566
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/env"
66-
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
6767
"sigs.k8s.io/gateway-api-inference-extension/version"
6868
)
6969

@@ -81,7 +81,7 @@ var (
8181
poolName = flag.String("pool-name", runserver.DefaultPoolName, "Name of the InferencePool this Endpoint Picker is associated with.")
8282
poolGroup = flag.String("pool-group", runserver.DefaultPoolGroup, "group of the InferencePool this Endpoint Picker is associated with.")
8383
poolNamespace = flag.String("pool-namespace", "", "Namespace of the InferencePool this Endpoint Picker is associated with.")
84-
logVerbosity = flag.Int("v", logging.DEFAULT, "number for the log level verbosity")
84+
logVerbosity = flag.Int("log-verbosity", logging.DEFAULT, "number for the log level verbosity, higher verbosity means more (and less important) logs will be generated")
8585
secureServing = flag.Bool("secure-serving", runserver.DefaultSecureServing, "Enables secure serving. Defaults to true.")
8686
healthChecking = flag.Bool("health-checking", runserver.DefaultHealthChecking, "Enables health checking")
8787
certPath = flag.String("cert-path", runserver.DefaultCertPath, "The path to the certificate for secure serving. The certificate and private key files "+

internal/telemetry/logging/logger.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ const (
3232
VERBOSE = 3
3333
DEBUG = 4
3434
TRACE = 5
35-
36-
DefaultLogLevel = "error"
3735
)
3836

3937
// NewTestLogger creates a new Zap logger using the dev mode.
@@ -54,11 +52,11 @@ func Fatal(logger logr.Logger, err error, msg string, keysAndValues ...any) {
5452
os.Exit(1)
5553
}
5654

57-
func InitLogging(text string, development bool) logr.Logger {
58-
level, _ := zapcore.ParseLevel(text)
55+
func InitLogging(logVerbosity int, development bool) logr.Logger {
56+
// See https://pkg.go.dev/sigs.k8s.io/controller-runtime/pkg/log/zap#Options.Level
5957
opts := &zap.Options{
6058
Development: development,
61-
Level: uberzap.NewAtomicLevelAt(level),
59+
Level: uberzap.NewAtomicLevelAt(zapcore.Level(int8(-1 * logVerbosity))),
6260
}
6361
logger := zap.New(zap.UseFlagOptions(opts), zap.RawZapOpts(uberzap.AddCaller()))
6462

0 commit comments

Comments
 (0)