From eaac82ceb916c00142253ba61388d4d1125151d3 Mon Sep 17 00:00:00 2001 From: balandi1 Date: Thu, 21 Nov 2019 15:26:57 -0500 Subject: [PATCH] Few code improvements and refactoring --- def/taskUtils.go | 2 +- elektronLogging/clsfnTaskDistOverheadLogger.go | 13 +++++++------ elektronLogging/consoleLogger.go | 3 ++- elektronLogging/logger.go | 2 +- elektronLogging/pcpLogger.go | 3 ++- elektronLogging/schedPolicySwitchLogger.go | 3 ++- elektronLogging/schedTraceLogger.go | 3 ++- elektronLogging/schedWindowLogger.go | 3 ++- 8 files changed, 19 insertions(+), 13 deletions(-) diff --git a/def/taskUtils.go b/def/taskUtils.go index ce69a53..c358a27 100644 --- a/def/taskUtils.go +++ b/def/taskUtils.go @@ -109,7 +109,7 @@ func clusterSizeAvgMMMPU(tasks []Task, taskObservation func(task Task) []float64 // skip this value // there is an error in the task config. elekLog.ElektronLog.Log(elekLogTypes.CONSOLE, log.ErrorLevel, - log.Fields{}, fmt.Sprintf("%s", err)) + log.Fields{}, err.Error()) } } else { // There is only one observation for the task. diff --git a/elektronLogging/clsfnTaskDistOverheadLogger.go b/elektronLogging/clsfnTaskDistOverheadLogger.go index 8216c71..7bd62a1 100644 --- a/elektronLogging/clsfnTaskDistOverheadLogger.go +++ b/elektronLogging/clsfnTaskDistOverheadLogger.go @@ -3,21 +3,22 @@ package elektronLogging import ( log "github.com/sirupsen/logrus" "os" + "path/filepath" "strings" ) -type ClsfnTaskDistOverheadLogger struct { +type ClsfnTaskDistrOverheadLogger struct { LoggerImpl } -func NewClsfnTaskDistOverheadLogger(logType int, prefix string) *ClsfnTaskDistOverheadLogger { - cLog := &ClsfnTaskDistOverheadLogger{} +func NewClsfnTaskDistrOverheadLogger(logType int, prefix string) *ClsfnTaskDistrOverheadLogger { + cLog := &ClsfnTaskDistrOverheadLogger{} cLog.Type = logType cLog.SetLogFile(prefix) return cLog } -func (cLog *ClsfnTaskDistOverheadLogger) Log(logType int, level log.Level, logData log.Fields, message string) { +func (cLog *ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, logData log.Fields, message string) { if cLog.Type == logType { logger.SetLevel(level) @@ -35,12 +36,12 @@ func (cLog *ClsfnTaskDistOverheadLogger) Log(logType int, level log.Level, logDa } } -func (cLog *ClsfnTaskDistOverheadLogger) SetLogFile(prefix string) { +func (cLog *ClsfnTaskDistrOverheadLogger) SetLogFile(prefix string) { tskDistLogPrefix := strings.Join([]string{prefix, config.TaskDistConfig.FilenameExtension}, "") dirName := logDir.getDirName() if dirName != "" { - tskDistLogPrefix = strings.Join([]string{dirName, tskDistLogPrefix}, "/") + tskDistLogPrefix = filepath.Join(dirName, tskDistLogPrefix) } if logFile, err := os.Create(tskDistLogPrefix); err != nil { log.Fatal("Unable to create logFile: ", err) diff --git a/elektronLogging/consoleLogger.go b/elektronLogging/consoleLogger.go index c142a7a..00e30e7 100644 --- a/elektronLogging/consoleLogger.go +++ b/elektronLogging/consoleLogger.go @@ -3,6 +3,7 @@ package elektronLogging import ( log "github.com/sirupsen/logrus" "os" + "path/filepath" "strings" ) @@ -37,7 +38,7 @@ func (cLog *ConsoleLogger) SetLogFile(prefix string) { consoleLogPrefix := strings.Join([]string{prefix, config.ConsoleConfig.FilenameExtension}, "") dirName := logDir.getDirName() if dirName != "" { - consoleLogPrefix = strings.Join([]string{dirName, consoleLogPrefix}, "/") + consoleLogPrefix = filepath.Join(dirName, consoleLogPrefix) } if logFile, err := os.Create(consoleLogPrefix); err != nil { log.Fatal("Unable to create logFile: ", err) diff --git a/elektronLogging/logger.go b/elektronLogging/logger.go index 1818536..72d32d7 100644 --- a/elektronLogging/logger.go +++ b/elektronLogging/logger.go @@ -39,7 +39,7 @@ func BuildLogger(prefix string) { schedTraceLog := NewSchedTraceLogger(SCHED_TRACE, prefix) spsLog := NewSchedPolicySwitchLogger(SPS, prefix) schedWindowLog := NewSchedWindowLogger(SCHED_WINDOW, prefix) - tskDistLog := NewClsfnTaskDistOverheadLogger(CLSFN_TASKDIST_OVERHEAD, prefix) + tskDistLog := NewClsfnTaskDistrOverheadLogger(CLSFN_TASKDIST_OVERHEAD, prefix) head.SetNext(cLog) cLog.SetNext(pLog) diff --git a/elektronLogging/pcpLogger.go b/elektronLogging/pcpLogger.go index 594ae95..e31369a 100644 --- a/elektronLogging/pcpLogger.go +++ b/elektronLogging/pcpLogger.go @@ -3,6 +3,7 @@ package elektronLogging import ( log "github.com/sirupsen/logrus" "os" + "path/filepath" "strings" ) @@ -40,7 +41,7 @@ func (plog *PcpLogger) SetLogFile(prefix string) { pcpLogPrefix := strings.Join([]string{prefix, config.PCPConfig.FilenameExtension}, "") dirName := logDir.getDirName() if dirName != "" { - pcpLogPrefix = strings.Join([]string{dirName, pcpLogPrefix}, "/") + pcpLogPrefix = filepath.Join(dirName, pcpLogPrefix) } if logFile, err := os.Create(pcpLogPrefix); err != nil { log.Fatal("Unable to create logFile: ", err) diff --git a/elektronLogging/schedPolicySwitchLogger.go b/elektronLogging/schedPolicySwitchLogger.go index ee72240..b6c7477 100644 --- a/elektronLogging/schedPolicySwitchLogger.go +++ b/elektronLogging/schedPolicySwitchLogger.go @@ -3,6 +3,7 @@ package elektronLogging import ( log "github.com/sirupsen/logrus" "os" + "path/filepath" "strings" ) @@ -40,7 +41,7 @@ func (sLog *SchedPolicySwitchLogger) SetLogFile(prefix string) { spsLogPrefix := strings.Join([]string{prefix, config.SPSConfig.FilenameExtension}, "") dirName := logDir.getDirName() if dirName != "" { - spsLogPrefix = strings.Join([]string{dirName, spsLogPrefix}, "/") + spsLogPrefix = filepath.Join(dirName, spsLogPrefix) } if logFile, err := os.Create(spsLogPrefix); err != nil { log.Fatal("Unable to create logFile: ", err) diff --git a/elektronLogging/schedTraceLogger.go b/elektronLogging/schedTraceLogger.go index 87ae4ec..91b06a9 100644 --- a/elektronLogging/schedTraceLogger.go +++ b/elektronLogging/schedTraceLogger.go @@ -3,6 +3,7 @@ package elektronLogging import ( log "github.com/sirupsen/logrus" "os" + "path/filepath" "strings" ) @@ -40,7 +41,7 @@ func (sLog *SchedTraceLogger) SetLogFile(prefix string) { schedTraceLogPrefix := strings.Join([]string{prefix, config.SchedTraceConfig.FilenameExtension}, "") dirName := logDir.getDirName() if dirName != "" { - schedTraceLogPrefix = strings.Join([]string{dirName, schedTraceLogPrefix}, "/") + schedTraceLogPrefix = filepath.Join(dirName, schedTraceLogPrefix) } if logFile, err := os.Create(schedTraceLogPrefix); err != nil { log.Fatal("Unable to create logFile: ", err) diff --git a/elektronLogging/schedWindowLogger.go b/elektronLogging/schedWindowLogger.go index ae55f95..6297c44 100644 --- a/elektronLogging/schedWindowLogger.go +++ b/elektronLogging/schedWindowLogger.go @@ -3,6 +3,7 @@ package elektronLogging import ( log "github.com/sirupsen/logrus" "os" + "path/filepath" "strings" ) @@ -40,7 +41,7 @@ func (sLog *SchedWindowLogger) SetLogFile(prefix string) { schedWindowLogPrefix := strings.Join([]string{prefix, config.SchedWindowConfig.FilenameExtension}, "") dirName := logDir.getDirName() if dirName != "" { - schedWindowLogPrefix = strings.Join([]string{dirName, schedWindowLogPrefix}, "/") + schedWindowLogPrefix = filepath.Join(dirName, schedWindowLogPrefix) } if logFile, err := os.Create(schedWindowLogPrefix); err != nil { log.Fatal("Unable to create logFile: ", err)