Skip to content

Commit 8f3e413

Browse files
committed
fix: lint findings
1 parent 89ccfd5 commit 8f3e413

File tree

6 files changed

+10
-7
lines changed

6 files changed

+10
-7
lines changed

cni/ipam/ipam_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ var (
9999
arg = &cniSkel.CmdArgs{}
100100

101101
log.InitializeMock()
102-
103102
})
104103

105104
_ = AfterSuite(func() {

cni/ipam/plugin/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func main() {
3737
MaxBackups: maxLogFileCount,
3838
Name: name,
3939
}
40-
log.Initialize(loggerCfg, ctx)
40+
log.Initialize(ctx, loggerCfg)
4141

4242
ipamPlugin, err := ipam.NewPlugin(name, &config)
4343
if err != nil {

cni/ipam/pluginv6/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func main() {
3737
MaxBackups: maxLogFileCount,
3838
Name: name,
3939
}
40-
log.Initialize(loggerCfg, ctx)
40+
log.Initialize(ctx, loggerCfg)
4141

4242
ipamPlugin, err := ipam.NewPlugin(name, &config)
4343
if err != nil {

cni/log/logger.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package log
22

33
import (
44
"context"
5+
"fmt"
56

67
"go.uber.org/zap"
78
"go.uber.org/zap/zapcore"
@@ -19,12 +20,15 @@ type Config struct {
1920
var Logger *zap.Logger
2021

2122
// Initializes a Zap logger and returns a cleanup function so logger can be cleaned up from caller
22-
func Initialize(cfg *Config, ctx context.Context) {
23+
func Initialize(ctx context.Context, cfg *Config) {
2324
Logger = newFileLogger(cfg)
2425

2526
go func() {
2627
<-ctx.Done()
27-
Logger.Sync()
28+
err := Logger.Sync()
29+
if err != nil {
30+
fmt.Println("failed to sync logger")
31+
}
2832
}()
2933
}
3034

cni/network/plugin/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ func main() {
302302
MaxBackups: maxLogFileCount,
303303
Name: name,
304304
}
305-
log.Initialize(loggerCfg, ctx)
305+
log.Initialize(ctx, loggerCfg)
306306

307307
if rootExecute() != nil {
308308
os.Exit(1)

cni/telemetry/service/telemetrymain.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func main() {
124124
MaxBackups: maxLogFileCount,
125125
Name: azureVnetTelemetry,
126126
}
127-
log.Initialize(loggerCfg, ctx)
127+
log.Initialize(ctx, loggerCfg)
128128

129129
log.Logger.Info("Telemetry invocation info", zap.Any("arguments", os.Args))
130130

0 commit comments

Comments
 (0)