From 614119e11b15fa58b71d8baa2b3821c5f2390642 Mon Sep 17 00:00:00 2001 From: Quang Nguyen Date: Tue, 19 Jul 2022 00:13:27 +0000 Subject: [PATCH 1/5] fixed not allocating loggerCfg in main --- azure-ipam/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-ipam/main.go b/azure-ipam/main.go index 3e75d5e9b9..dec5f17bca 100644 --- a/azure-ipam/main.go +++ b/azure-ipam/main.go @@ -21,7 +21,7 @@ func main() { func executePlugin() error { // logger config - var loggerCfg *logger.Config + loggerCfg := &logger.Config{} loggerCfg.Level = "debug" loggerCfg.OutputPaths = "stdout" loggerCfg.ErrorOutputPaths = "stderr" From 7ba7a883ffaa4189c620bf4295684fd73023202a Mon Sep 17 00:00:00 2001 From: Quang Nguyen Date: Tue, 19 Jul 2022 09:25:30 -0700 Subject: [PATCH 2/5] Update azure-ipam/main.go Co-authored-by: Evan Baker --- azure-ipam/main.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure-ipam/main.go b/azure-ipam/main.go index dec5f17bca..adb4004d5f 100644 --- a/azure-ipam/main.go +++ b/azure-ipam/main.go @@ -21,7 +21,11 @@ func main() { func executePlugin() error { // logger config - loggerCfg := &logger.Config{} + loggerCfg := &logger.Config{ + Level: "debug", + OutputPaths: "stdout", + ErrorOutputPaths: "stderr" + } loggerCfg.Level = "debug" loggerCfg.OutputPaths = "stdout" loggerCfg.ErrorOutputPaths = "stderr" From 7e55e2996fae1b24c62944f0b80284b23e15635b Mon Sep 17 00:00:00 2001 From: Quang Nguyen Date: Tue, 19 Jul 2022 19:55:52 +0000 Subject: [PATCH 3/5] inline logger config --- azure-ipam/main.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/azure-ipam/main.go b/azure-ipam/main.go index adb4004d5f..7210a7526c 100644 --- a/azure-ipam/main.go +++ b/azure-ipam/main.go @@ -22,14 +22,10 @@ func main() { func executePlugin() error { // logger config loggerCfg := &logger.Config{ - Level: "debug", - OutputPaths: "stdout", - ErrorOutputPaths: "stderr" + Level: "debug", + OutputPaths: "var/log/azure-ipam.log", + ErrorOutputPaths: "stderr", } - loggerCfg.Level = "debug" - loggerCfg.OutputPaths = "stdout" - loggerCfg.ErrorOutputPaths = "stderr" - // Create logger pluginLogger, cleanup, err := logger.New(loggerCfg) if err != nil { From 14b60fc24f58d70f16a34edd2586b9f6ebaf790a Mon Sep 17 00:00:00 2001 From: Quang Nguyen Date: Wed, 20 Jul 2022 02:08:07 +0000 Subject: [PATCH 4/5] change logs output path --- azure-ipam/logger/logger.go | 2 ++ azure-ipam/main.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/azure-ipam/logger/logger.go b/azure-ipam/logger/logger.go index 4fcd8e989c..1cd331f7e0 100644 --- a/azure-ipam/logger/logger.go +++ b/azure-ipam/logger/logger.go @@ -28,9 +28,11 @@ func New(cfg *Config) (*zap.Logger, func(), error) { loggerCfg.OutputPaths = getLogOutputPath(cfg.OutputPaths) loggerCfg.ErrorOutputPaths = getErrOutputPath(cfg.ErrorOutputPaths) loggerCfg.EncoderConfig = zapcore.EncoderConfig{ + TimeKey: "time", MessageKey: "msg", LevelKey: "level", EncodeLevel: zapcore.LowercaseLevelEncoder, + EncodeTime: zapcore.ISO8601TimeEncoder, } logger, err := loggerCfg.Build() diff --git a/azure-ipam/main.go b/azure-ipam/main.go index 7210a7526c..c911923d90 100644 --- a/azure-ipam/main.go +++ b/azure-ipam/main.go @@ -24,7 +24,7 @@ func executePlugin() error { loggerCfg := &logger.Config{ Level: "debug", OutputPaths: "var/log/azure-ipam.log", - ErrorOutputPaths: "stderr", + ErrorOutputPaths: "var/log/azure-ipam.log", } // Create logger pluginLogger, cleanup, err := logger.New(loggerCfg) From be5abd6ae44422c0c94d96058a98cff8e1b71a7f Mon Sep 17 00:00:00 2001 From: Quang Nguyen Date: Wed, 20 Jul 2022 20:05:58 +0000 Subject: [PATCH 5/5] check err from skel.PluginMainWithError --- azure-ipam/main.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/azure-ipam/main.go b/azure-ipam/main.go index c911923d90..1bce3d5e16 100644 --- a/azure-ipam/main.go +++ b/azure-ipam/main.go @@ -48,5 +48,11 @@ func executePlugin() error { } // Execute CNI plugin - return skel.PluginMainWithError(plugin.CmdAdd, plugin.CmdCheck, plugin.CmdDel, version.All, bv.BuildString(pluginName)) + cniErr := skel.PluginMainWithError(plugin.CmdAdd, plugin.CmdCheck, plugin.CmdDel, version.All, bv.BuildString(pluginName)) + if cniErr != nil { + cniErr.Print() + return cniErr + } + + return nil }