From 371b27b16ab58209b5cfba79047f5e777650134a Mon Sep 17 00:00:00 2001 From: Tomofumi Hayashi Date: Thu, 12 Jul 2018 12:15:53 +0900 Subject: [PATCH] Incorporate rkamudhan's comment. --- logging/logging.go | 2 +- types/conf.go | 8 ++++---- types/types.go | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/logging/logging.go b/logging/logging.go index 45394a3b0..3e1fbdb1d 100644 --- a/logging/logging.go +++ b/logging/logging.go @@ -124,7 +124,7 @@ func SetLogFile (filename string) { } func init() { - loggingStderr = false + loggingStderr = true loggingFp = nil loggingLevel = PanicLevel } diff --git a/types/conf.go b/types/conf.go index 3e3893409..92861f168 100644 --- a/types/conf.go +++ b/types/conf.go @@ -52,11 +52,11 @@ func LoadNetConf(bytes []byte) (*NetConf, error) { } // Logging - if netconf.Logging != "" { - logging.SetLogFile(netconf.Logging) + if netconf.LogFile != "" { + logging.SetLogFile(netconf.LogFile) } - if netconf.LoggingLevel != "" { - logging.SetLogLevel(netconf.LoggingLevel) + if netconf.LogLevel != "" { + logging.SetLogLevel(netconf.LogLevel) } // Parse previous result diff --git a/types/types.go b/types/types.go index b12cfea1d..bf655318c 100644 --- a/types/types.go +++ b/types/types.go @@ -38,8 +38,8 @@ type NetConf struct { RawDelegates []map[string]interface{} `json:"delegates"` Delegates []*DelegateNetConf `json:"-"` Kubeconfig string `json:"kubeconfig"` - Logging string `json:"logging"` - LoggingLevel string `json:"logging_level"` + LogFile string `json:"logFile"` + LogLevel string `json:"logLevel"` } type DelegateNetConf struct {