From 02abb1e8820b91e8a6195d3d452a8fbd6daed027 Mon Sep 17 00:00:00 2001 From: balandi1 Date: Fri, 6 Dec 2019 12:59:35 -0500 Subject: [PATCH] Added functions to access members Functions to access all members of baseElektronLogger.config --- logging/clsfnTaskDistrOverheadLogger.go | 6 +++--- logging/consoleLogger.go | 2 +- logging/logger.go | 10 ++++++++++ logging/pcpLogger.go | 6 +++--- logging/schedPolicySwitchLogger.go | 6 +++--- logging/schedTraceLogger.go | 6 +++--- logging/schedWindowLogger.go | 6 +++--- 7 files changed, 26 insertions(+), 16 deletions(-) diff --git a/logging/clsfnTaskDistrOverheadLogger.go b/logging/clsfnTaskDistrOverheadLogger.go index 69e2ab0..79d0afc 100644 --- a/logging/clsfnTaskDistrOverheadLogger.go +++ b/logging/clsfnTaskDistrOverheadLogger.go @@ -45,7 +45,7 @@ func newClsfnTaskDistrOverheadLogger( func (cLog clsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, message string) { if cLog.logType == logType { if cLog.isEnabled() { - if cLog.config.AllowOnConsole { + if cLog.isAllowedOnConsole() { cLog.logger.SetOutput(os.Stdout) cLog.logger.WithFields(cLog.data).Log(level, message) } @@ -66,7 +66,7 @@ func (cLog clsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, messa func (cLog clsfnTaskDistrOverheadLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { if cLog.logType == logType { if cLog.isEnabled() { - if cLog.config.AllowOnConsole { + if cLog.isAllowedOnConsole() { cLog.logger.SetOutput(os.Stdout) cLog.logger.WithFields(cLog.data).Logf(level, msgFmtString, args...) } @@ -86,7 +86,7 @@ func (cLog clsfnTaskDistrOverheadLogger) Logf(logType int, level log.Level, msgF func (cLog *clsfnTaskDistrOverheadLogger) createLogFile(prefix string) { if cLog.isEnabled() { - filename := strings.Join([]string{prefix, cLog.config.FilenameExtension}, "") + filename := strings.Join([]string{prefix, cLog.getFilenameExtension()}, "") dirName := cLog.logDir.getDirName() if dirName != "" { if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { diff --git a/logging/consoleLogger.go b/logging/consoleLogger.go index 2bc7666..2a2f389 100644 --- a/logging/consoleLogger.go +++ b/logging/consoleLogger.go @@ -86,7 +86,7 @@ func (cLog consoleLogger) Logf(logType int, level log.Level, msgFmtString string func (cLog *consoleLogger) createLogFile(prefix string) { // Create log file for the type if it is enabled. if cLog.isEnabled() { - filename := strings.Join([]string{prefix, cLog.config.FilenameExtension}, "") + filename := strings.Join([]string{prefix, cLog.getFilenameExtension()}, "") dirName := cLog.logDir.getDirName() fmt.Println(dirName) if dirName != "" { diff --git a/logging/logger.go b/logging/logger.go index b8c65d1..b0a5bf9 100644 --- a/logging/logger.go +++ b/logging/logger.go @@ -17,6 +17,8 @@ var elektronLoggerInstance elektronLogger type elektronLogger interface { setNext(next elektronLogger) isEnabled() bool + isAllowedOnConsole() bool + getFilenameExtension() string Log(logType int, level log.Level, message string) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) WithFields(logData log.Fields) elektronLogger @@ -47,6 +49,14 @@ func (l baseElektronLogger) isEnabled() bool { return l.config.Enabled } +func (l baseElektronLogger) isAllowedOnConsole() bool { + return l.config.AllowOnConsole +} + +func (l baseElektronLogger) getFilenameExtension() string { + return l.config.FilenameExtension +} + func (l *baseElektronLogger) WithFields(logData log.Fields) elektronLogger { l.data = logData return l diff --git a/logging/pcpLogger.go b/logging/pcpLogger.go index 7767f4d..9770db5 100644 --- a/logging/pcpLogger.go +++ b/logging/pcpLogger.go @@ -46,7 +46,7 @@ func newPCPLogger( func (pLog pcpLogger) Log(logType int, level log.Level, message string) { if pLog.logType == logType { if pLog.isEnabled() { - if pLog.config.AllowOnConsole { + if pLog.isAllowedOnConsole() { pLog.logger.SetOutput(os.Stdout) pLog.logger.WithFields(pLog.data).Log(level, message) } @@ -66,7 +66,7 @@ func (pLog pcpLogger) Log(logType int, level log.Level, message string) { func (pLog pcpLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { if pLog.logType == logType { if pLog.isEnabled() { - if pLog.config.AllowOnConsole { + if pLog.isAllowedOnConsole() { pLog.logger.SetOutput(os.Stdout) pLog.logger.WithFields(pLog.data).Logf(level, msgFmtString, args...) } @@ -86,7 +86,7 @@ func (pLog pcpLogger) Logf(logType int, level log.Level, msgFmtString string, ar func (pLog *pcpLogger) createLogFile(prefix string) { if pLog.isEnabled() { - filename := strings.Join([]string{prefix, pLog.config.FilenameExtension}, "") + filename := strings.Join([]string{prefix, pLog.getFilenameExtension()}, "") dirName := pLog.logDir.getDirName() if dirName != "" { if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { diff --git a/logging/schedPolicySwitchLogger.go b/logging/schedPolicySwitchLogger.go index a112db3..d7c23c3 100644 --- a/logging/schedPolicySwitchLogger.go +++ b/logging/schedPolicySwitchLogger.go @@ -46,7 +46,7 @@ func newSchedPolicySwitchLogger( func (sLog schedPolicySwitchLogger) Log(logType int, level log.Level, message string) { if sLog.logType == logType { if sLog.isEnabled() { - if sLog.config.AllowOnConsole { + if sLog.isAllowedOnConsole() { sLog.logger.SetOutput(os.Stdout) sLog.logger.WithFields(sLog.data).Log(level, message) } @@ -66,7 +66,7 @@ func (sLog schedPolicySwitchLogger) Log(logType int, level log.Level, message st func (sLog schedPolicySwitchLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { if sLog.logType == logType { if sLog.isEnabled() { - if sLog.config.AllowOnConsole { + if sLog.isAllowedOnConsole() { sLog.logger.SetOutput(os.Stdout) sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) } @@ -86,7 +86,7 @@ func (sLog schedPolicySwitchLogger) Logf(logType int, level log.Level, msgFmtStr func (sLog *schedPolicySwitchLogger) createLogFile(prefix string) { if sLog.isEnabled() { - filename := strings.Join([]string{prefix, sLog.config.FilenameExtension}, "") + filename := strings.Join([]string{prefix, sLog.getFilenameExtension()}, "") dirName := sLog.logDir.getDirName() if dirName != "" { if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { diff --git a/logging/schedTraceLogger.go b/logging/schedTraceLogger.go index ac08f27..d90f82c 100644 --- a/logging/schedTraceLogger.go +++ b/logging/schedTraceLogger.go @@ -46,7 +46,7 @@ func newSchedTraceLogger( func (sLog schedTraceLogger) Log(logType int, level log.Level, message string) { if sLog.logType == logType { if sLog.isEnabled() { - if sLog.config.AllowOnConsole { + if sLog.isAllowedOnConsole() { sLog.logger.SetOutput(os.Stdout) sLog.logger.WithFields(sLog.data).Log(level, message) } @@ -66,7 +66,7 @@ func (sLog schedTraceLogger) Log(logType int, level log.Level, message string) { func (sLog schedTraceLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { if sLog.logType == logType { if sLog.isEnabled() { - if sLog.config.AllowOnConsole { + if sLog.isAllowedOnConsole() { sLog.logger.SetOutput(os.Stdout) sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) } @@ -86,7 +86,7 @@ func (sLog schedTraceLogger) Logf(logType int, level log.Level, msgFmtString str func (sLog *schedTraceLogger) createLogFile(prefix string) { if sLog.isEnabled() { - filename := strings.Join([]string{prefix, sLog.config.FilenameExtension}, "") + filename := strings.Join([]string{prefix, sLog.getFilenameExtension()}, "") dirName := sLog.logDir.getDirName() if dirName != "" { if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { diff --git a/logging/schedWindowLogger.go b/logging/schedWindowLogger.go index 5a1ce1a..ffa5437 100644 --- a/logging/schedWindowLogger.go +++ b/logging/schedWindowLogger.go @@ -46,7 +46,7 @@ func newSchedWindowLogger( func (sLog schedWindowLogger) Log(logType int, level log.Level, message string) { if sLog.logType == logType { if sLog.isEnabled() { - if sLog.config.AllowOnConsole { + if sLog.isAllowedOnConsole() { sLog.logger.SetOutput(os.Stdout) sLog.logger.WithFields(sLog.data).Log(level, message) } @@ -67,7 +67,7 @@ func (sLog schedWindowLogger) Log(logType int, level log.Level, message string) func (sLog schedWindowLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { if sLog.logType == logType { if sLog.isEnabled() { - if sLog.config.AllowOnConsole { + if sLog.isAllowedOnConsole() { sLog.logger.SetOutput(os.Stdout) sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) } @@ -86,7 +86,7 @@ func (sLog schedWindowLogger) Logf(logType int, level log.Level, msgFmtString st func (sLog *schedWindowLogger) createLogFile(prefix string) { if sLog.isEnabled() { - filename := strings.Join([]string{prefix, sLog.config.FilenameExtension}, "") + filename := strings.Join([]string{prefix, sLog.getFilenameExtension()}, "") dirName := sLog.logDir.getDirName() if dirName != "" { if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {