From d0e989136ef223fb501ee159955380fe45f301e7 Mon Sep 17 00:00:00 2001 From: balandi1 Date: Tue, 26 Nov 2019 18:02:24 -0500 Subject: [PATCH] Handled ennabling/disabling log types Added enabled check while creating log files and logging. Do not allow to create log file or log if the log type is disabled. --- .../clsfnTaskDistOverheadLogger.go | 40 ++++++++++-------- elektronLogging/consoleLogger.go | 38 +++++++++-------- elektronLogging/pcpLogger.go | 41 ++++++++++--------- elektronLogging/schedPolicySwitchLogger.go | 41 ++++++++++--------- elektronLogging/schedTraceLogger.go | 41 ++++++++++--------- elektronLogging/schedWindowLogger.go | 41 ++++++++++--------- 6 files changed, 131 insertions(+), 111 deletions(-) diff --git a/elektronLogging/clsfnTaskDistOverheadLogger.go b/elektronLogging/clsfnTaskDistOverheadLogger.go index db1dbee..e23f43d 100644 --- a/elektronLogging/clsfnTaskDistOverheadLogger.go +++ b/elektronLogging/clsfnTaskDistOverheadLogger.go @@ -20,33 +20,37 @@ func NewClsfnTaskDistrOverheadLogger(logType int, prefix string) *ClsfnTaskDistr } func (cLog ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, logData log.Fields, message string) { - if cLog.Type == logType { + if config.TaskDistrConfig.Enabled { + if cLog.Type == logType { - logger.SetLevel(level) + logger.SetLevel(level) - if cLog.AllowOnConsole { - logger.SetOutput(os.Stdout) + if cLog.AllowOnConsole { + logger.SetOutput(os.Stdout) + logger.WithFields(logData).Println(message) + } + + logger.SetOutput(cLog.LogFile) logger.WithFields(logData).Println(message) } - - logger.SetOutput(cLog.LogFile) - logger.WithFields(logData).Println(message) - } - if cLog.next != nil { - cLog.next.Log(logType, level, logData, message) + if cLog.next != nil { + cLog.next.Log(logType, level, logData, message) + } } } func (cLog *ClsfnTaskDistrOverheadLogger) CreateLogFile(prefix string) { - filename := strings.Join([]string{prefix, config.TaskDistrConfig.FilenameExtension}, "") - dirName := logDir.getDirName() - if dirName != "" { - if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { - log.Fatal("Unable to create logFile: ", err) - } else { - cLog.LogFile = logFile - cLog.AllowOnConsole = config.TaskDistrConfig.AllowOnConsole + if config.TaskDistrConfig.Enabled { + filename := strings.Join([]string{prefix, config.TaskDistrConfig.FilenameExtension}, "") + dirName := logDir.getDirName() + if dirName != "" { + if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { + log.Fatal("Unable to create logFile: ", err) + } else { + cLog.LogFile = logFile + cLog.AllowOnConsole = config.TaskDistrConfig.AllowOnConsole + } } } } diff --git a/elektronLogging/consoleLogger.go b/elektronLogging/consoleLogger.go index 52a62a6..d48cd22 100644 --- a/elektronLogging/consoleLogger.go +++ b/elektronLogging/consoleLogger.go @@ -19,31 +19,35 @@ func NewConsoleLogger(logType int, prefix string) *ConsoleLogger { return cLog } func (cLog ConsoleLogger) Log(logType int, level log.Level, logData log.Fields, message string) { - if logType <= cLog.Type { + if config.ConsoleConfig.Enabled { + if logType <= cLog.Type { - logger.SetLevel(level) + logger.SetLevel(level) - logger.SetOutput(os.Stdout) - logger.WithFields(logData).Println(message) + logger.SetOutput(os.Stdout) + logger.WithFields(logData).Println(message) - logger.SetOutput(cLog.LogFile) - logger.WithFields(logData).Println(message) - } - if cLog.next != nil { - cLog.next.Log(logType, level, logData, message) + logger.SetOutput(cLog.LogFile) + logger.WithFields(logData).Println(message) + } + if cLog.next != nil { + cLog.next.Log(logType, level, logData, message) + } } } func (cLog *ConsoleLogger) CreateLogFile(prefix string) { - filename := strings.Join([]string{prefix, config.ConsoleConfig.FilenameExtension}, "") - dirName := logDir.getDirName() - if dirName != "" { - if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { - log.Fatal("Unable to create logFile: ", err) - } else { - cLog.LogFile = logFile - cLog.AllowOnConsole = config.ConsoleConfig.AllowOnConsole + if config.ConsoleConfig.Enabled { + filename := strings.Join([]string{prefix, config.ConsoleConfig.FilenameExtension}, "") + dirName := logDir.getDirName() + if dirName != "" { + if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { + log.Fatal("Unable to create logFile: ", err) + } else { + cLog.LogFile = logFile + cLog.AllowOnConsole = config.ConsoleConfig.AllowOnConsole + } } } } diff --git a/elektronLogging/pcpLogger.go b/elektronLogging/pcpLogger.go index fd9c39c..ff68838 100644 --- a/elektronLogging/pcpLogger.go +++ b/elektronLogging/pcpLogger.go @@ -20,33 +20,36 @@ func NewPCPLogger(logType int, prefix string) *PCPLogger { } func (pLog PCPLogger) Log(logType int, level log.Level, logData log.Fields, message string) { - if pLog.Type == logType { + if config.PCPConfig.Enabled { + if pLog.Type == logType { - logger.SetLevel(level) + logger.SetLevel(level) - if pLog.AllowOnConsole { - logger.SetOutput(os.Stdout) + if pLog.AllowOnConsole { + logger.SetOutput(os.Stdout) + logger.WithFields(logData).Println(message) + } + + logger.SetOutput(pLog.LogFile) logger.WithFields(logData).Println(message) } - - logger.SetOutput(pLog.LogFile) - logger.WithFields(logData).Println(message) - } - if pLog.next != nil { - pLog.next.Log(logType, level, logData, message) + if pLog.next != nil { + pLog.next.Log(logType, level, logData, message) + } } } func (pLog *PCPLogger) CreateLogFile(prefix string) { - - filename := strings.Join([]string{prefix, config.PCPConfig.FilenameExtension}, "") - dirName := logDir.getDirName() - if dirName != "" { - if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { - log.Fatal("Unable to create logFile: ", err) - } else { - pLog.LogFile = logFile - pLog.AllowOnConsole = config.PCPConfig.AllowOnConsole + if config.PCPConfig.Enabled { + filename := strings.Join([]string{prefix, config.PCPConfig.FilenameExtension}, "") + dirName := logDir.getDirName() + if dirName != "" { + if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { + log.Fatal("Unable to create logFile: ", err) + } else { + pLog.LogFile = logFile + pLog.AllowOnConsole = config.PCPConfig.AllowOnConsole + } } } } diff --git a/elektronLogging/schedPolicySwitchLogger.go b/elektronLogging/schedPolicySwitchLogger.go index 8e7b887..74a1e31 100644 --- a/elektronLogging/schedPolicySwitchLogger.go +++ b/elektronLogging/schedPolicySwitchLogger.go @@ -20,33 +20,36 @@ func NewSchedPolicySwitchLogger(logType int, prefix string) *SchedPolicySwitchLo } func (sLog SchedPolicySwitchLogger) Log(logType int, level log.Level, logData log.Fields, message string) { - if sLog.Type == logType { + if config.SPSConfig.Enabled { + if sLog.Type == logType { - logger.SetLevel(level) + logger.SetLevel(level) - if sLog.AllowOnConsole { - logger.SetOutput(os.Stdout) + if sLog.AllowOnConsole { + logger.SetOutput(os.Stdout) + logger.WithFields(logData).Println(message) + } + + logger.SetOutput(sLog.LogFile) logger.WithFields(logData).Println(message) } - - logger.SetOutput(sLog.LogFile) - logger.WithFields(logData).Println(message) - } - if sLog.next != nil { - sLog.next.Log(logType, level, logData, message) + if sLog.next != nil { + sLog.next.Log(logType, level, logData, message) + } } } func (sLog *SchedPolicySwitchLogger) CreateLogFile(prefix string) { - - filename := strings.Join([]string{prefix, config.SPSConfig.FilenameExtension}, "") - dirName := logDir.getDirName() - if dirName != "" { - if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { - log.Fatal("Unable to create logFile: ", err) - } else { - sLog.LogFile = logFile - sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole + if config.SPSConfig.Enabled { + filename := strings.Join([]string{prefix, config.SPSConfig.FilenameExtension}, "") + dirName := logDir.getDirName() + if dirName != "" { + if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { + log.Fatal("Unable to create logFile: ", err) + } else { + sLog.LogFile = logFile + sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole + } } } } diff --git a/elektronLogging/schedTraceLogger.go b/elektronLogging/schedTraceLogger.go index 9b692b9..208bf2a 100644 --- a/elektronLogging/schedTraceLogger.go +++ b/elektronLogging/schedTraceLogger.go @@ -20,33 +20,36 @@ func NewSchedTraceLogger(logType int, prefix string) *SchedTraceLogger { } func (sLog SchedTraceLogger) Log(logType int, level log.Level, logData log.Fields, message string) { - if sLog.Type == logType { + if config.SchedTraceConfig.Enabled { + if sLog.Type == logType { - logger.SetLevel(level) + logger.SetLevel(level) - if sLog.AllowOnConsole { - logger.SetOutput(os.Stdout) + if sLog.AllowOnConsole { + logger.SetOutput(os.Stdout) + logger.WithFields(logData).Println(message) + } + + logger.SetOutput(sLog.LogFile) logger.WithFields(logData).Println(message) } - - logger.SetOutput(sLog.LogFile) - logger.WithFields(logData).Println(message) - } - if sLog.next != nil { - sLog.next.Log(logType, level, logData, message) + if sLog.next != nil { + sLog.next.Log(logType, level, logData, message) + } } } func (sLog *SchedTraceLogger) CreateLogFile(prefix string) { - - filename := strings.Join([]string{prefix, config.SchedTraceConfig.FilenameExtension}, "") - dirName := logDir.getDirName() - if dirName != "" { - if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { - log.Fatal("Unable to create logFile: ", err) - } else { - sLog.LogFile = logFile - sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole + if config.SchedTraceConfig.Enabled { + filename := strings.Join([]string{prefix, config.SchedTraceConfig.FilenameExtension}, "") + dirName := logDir.getDirName() + if dirName != "" { + if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { + log.Fatal("Unable to create logFile: ", err) + } else { + sLog.LogFile = logFile + sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole + } } } } diff --git a/elektronLogging/schedWindowLogger.go b/elektronLogging/schedWindowLogger.go index b5e94da..44184d0 100644 --- a/elektronLogging/schedWindowLogger.go +++ b/elektronLogging/schedWindowLogger.go @@ -20,33 +20,36 @@ func NewSchedWindowLogger(logType int, prefix string) *SchedWindowLogger { } func (sLog SchedWindowLogger) Log(logType int, level log.Level, logData log.Fields, message string) { - if sLog.Type == logType { + if config.SchedWindowConfig.Enabled { + if sLog.Type == logType { - logger.SetLevel(level) + logger.SetLevel(level) - if sLog.AllowOnConsole { - logger.SetOutput(os.Stdout) + if sLog.AllowOnConsole { + logger.SetOutput(os.Stdout) + logger.WithFields(logData).Println(message) + } + + logger.SetOutput(sLog.LogFile) logger.WithFields(logData).Println(message) } - - logger.SetOutput(sLog.LogFile) - logger.WithFields(logData).Println(message) - } - if sLog.next != nil { - sLog.next.Log(logType, level, logData, message) + if sLog.next != nil { + sLog.next.Log(logType, level, logData, message) + } } } func (sLog *SchedWindowLogger) CreateLogFile(prefix string) { - - filename := strings.Join([]string{prefix, config.SchedWindowConfig.FilenameExtension}, "") - dirName := logDir.getDirName() - if dirName != "" { - if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { - log.Fatal("Unable to create logFile: ", err) - } else { - sLog.LogFile = logFile - sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole + if config.SchedWindowConfig.Enabled { + filename := strings.Join([]string{prefix, config.SchedWindowConfig.FilenameExtension}, "") + dirName := logDir.getDirName() + if dirName != "" { + if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { + log.Fatal("Unable to create logFile: ", err) + } else { + sLog.LogFile = logFile + sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole + } } } }