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 3e75d5e9b9..1bce3d5e16 100644 --- a/azure-ipam/main.go +++ b/azure-ipam/main.go @@ -21,11 +21,11 @@ func main() { func executePlugin() error { // logger config - var loggerCfg *logger.Config - loggerCfg.Level = "debug" - loggerCfg.OutputPaths = "stdout" - loggerCfg.ErrorOutputPaths = "stderr" - + loggerCfg := &logger.Config{ + Level: "debug", + OutputPaths: "var/log/azure-ipam.log", + ErrorOutputPaths: "var/log/azure-ipam.log", + } // Create logger pluginLogger, cleanup, err := logger.New(loggerCfg) if err != nil { @@ -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 }