Few code improvements and refactoring
This commit is contained in:
parent
cb5df9acc8
commit
eaac82ceb9
8 changed files with 19 additions and 13 deletions
|
@ -109,7 +109,7 @@ func clusterSizeAvgMMMPU(tasks []Task, taskObservation func(task Task) []float64
|
||||||
// skip this value
|
// skip this value
|
||||||
// there is an error in the task config.
|
// there is an error in the task config.
|
||||||
elekLog.ElektronLog.Log(elekLogTypes.CONSOLE, log.ErrorLevel,
|
elekLog.ElektronLog.Log(elekLogTypes.CONSOLE, log.ErrorLevel,
|
||||||
log.Fields{}, fmt.Sprintf("%s", err))
|
log.Fields{}, err.Error())
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// There is only one observation for the task.
|
// There is only one observation for the task.
|
||||||
|
|
|
@ -3,21 +3,22 @@ package elektronLogging
|
||||||
import (
|
import (
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
type ClsfnTaskDistOverheadLogger struct {
|
type ClsfnTaskDistrOverheadLogger struct {
|
||||||
LoggerImpl
|
LoggerImpl
|
||||||
}
|
}
|
||||||
|
|
||||||
func NewClsfnTaskDistOverheadLogger(logType int, prefix string) *ClsfnTaskDistOverheadLogger {
|
func NewClsfnTaskDistrOverheadLogger(logType int, prefix string) *ClsfnTaskDistrOverheadLogger {
|
||||||
cLog := &ClsfnTaskDistOverheadLogger{}
|
cLog := &ClsfnTaskDistrOverheadLogger{}
|
||||||
cLog.Type = logType
|
cLog.Type = logType
|
||||||
cLog.SetLogFile(prefix)
|
cLog.SetLogFile(prefix)
|
||||||
return cLog
|
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 {
|
if cLog.Type == logType {
|
||||||
|
|
||||||
logger.SetLevel(level)
|
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}, "")
|
tskDistLogPrefix := strings.Join([]string{prefix, config.TaskDistConfig.FilenameExtension}, "")
|
||||||
dirName := logDir.getDirName()
|
dirName := logDir.getDirName()
|
||||||
if dirName != "" {
|
if dirName != "" {
|
||||||
tskDistLogPrefix = strings.Join([]string{dirName, tskDistLogPrefix}, "/")
|
tskDistLogPrefix = filepath.Join(dirName, tskDistLogPrefix)
|
||||||
}
|
}
|
||||||
if logFile, err := os.Create(tskDistLogPrefix); err != nil {
|
if logFile, err := os.Create(tskDistLogPrefix); err != nil {
|
||||||
log.Fatal("Unable to create logFile: ", err)
|
log.Fatal("Unable to create logFile: ", err)
|
||||||
|
|
|
@ -3,6 +3,7 @@ package elektronLogging
|
||||||
import (
|
import (
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -37,7 +38,7 @@ func (cLog *ConsoleLogger) SetLogFile(prefix string) {
|
||||||
consoleLogPrefix := strings.Join([]string{prefix, config.ConsoleConfig.FilenameExtension}, "")
|
consoleLogPrefix := strings.Join([]string{prefix, config.ConsoleConfig.FilenameExtension}, "")
|
||||||
dirName := logDir.getDirName()
|
dirName := logDir.getDirName()
|
||||||
if dirName != "" {
|
if dirName != "" {
|
||||||
consoleLogPrefix = strings.Join([]string{dirName, consoleLogPrefix}, "/")
|
consoleLogPrefix = filepath.Join(dirName, consoleLogPrefix)
|
||||||
}
|
}
|
||||||
if logFile, err := os.Create(consoleLogPrefix); err != nil {
|
if logFile, err := os.Create(consoleLogPrefix); err != nil {
|
||||||
log.Fatal("Unable to create logFile: ", err)
|
log.Fatal("Unable to create logFile: ", err)
|
||||||
|
|
|
@ -39,7 +39,7 @@ func BuildLogger(prefix string) {
|
||||||
schedTraceLog := NewSchedTraceLogger(SCHED_TRACE, prefix)
|
schedTraceLog := NewSchedTraceLogger(SCHED_TRACE, prefix)
|
||||||
spsLog := NewSchedPolicySwitchLogger(SPS, prefix)
|
spsLog := NewSchedPolicySwitchLogger(SPS, prefix)
|
||||||
schedWindowLog := NewSchedWindowLogger(SCHED_WINDOW, prefix)
|
schedWindowLog := NewSchedWindowLogger(SCHED_WINDOW, prefix)
|
||||||
tskDistLog := NewClsfnTaskDistOverheadLogger(CLSFN_TASKDIST_OVERHEAD, prefix)
|
tskDistLog := NewClsfnTaskDistrOverheadLogger(CLSFN_TASKDIST_OVERHEAD, prefix)
|
||||||
|
|
||||||
head.SetNext(cLog)
|
head.SetNext(cLog)
|
||||||
cLog.SetNext(pLog)
|
cLog.SetNext(pLog)
|
||||||
|
|
|
@ -3,6 +3,7 @@ package elektronLogging
|
||||||
import (
|
import (
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -40,7 +41,7 @@ func (plog *PcpLogger) SetLogFile(prefix string) {
|
||||||
pcpLogPrefix := strings.Join([]string{prefix, config.PCPConfig.FilenameExtension}, "")
|
pcpLogPrefix := strings.Join([]string{prefix, config.PCPConfig.FilenameExtension}, "")
|
||||||
dirName := logDir.getDirName()
|
dirName := logDir.getDirName()
|
||||||
if dirName != "" {
|
if dirName != "" {
|
||||||
pcpLogPrefix = strings.Join([]string{dirName, pcpLogPrefix}, "/")
|
pcpLogPrefix = filepath.Join(dirName, pcpLogPrefix)
|
||||||
}
|
}
|
||||||
if logFile, err := os.Create(pcpLogPrefix); err != nil {
|
if logFile, err := os.Create(pcpLogPrefix); err != nil {
|
||||||
log.Fatal("Unable to create logFile: ", err)
|
log.Fatal("Unable to create logFile: ", err)
|
||||||
|
|
|
@ -3,6 +3,7 @@ package elektronLogging
|
||||||
import (
|
import (
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -40,7 +41,7 @@ func (sLog *SchedPolicySwitchLogger) SetLogFile(prefix string) {
|
||||||
spsLogPrefix := strings.Join([]string{prefix, config.SPSConfig.FilenameExtension}, "")
|
spsLogPrefix := strings.Join([]string{prefix, config.SPSConfig.FilenameExtension}, "")
|
||||||
dirName := logDir.getDirName()
|
dirName := logDir.getDirName()
|
||||||
if dirName != "" {
|
if dirName != "" {
|
||||||
spsLogPrefix = strings.Join([]string{dirName, spsLogPrefix}, "/")
|
spsLogPrefix = filepath.Join(dirName, spsLogPrefix)
|
||||||
}
|
}
|
||||||
if logFile, err := os.Create(spsLogPrefix); err != nil {
|
if logFile, err := os.Create(spsLogPrefix); err != nil {
|
||||||
log.Fatal("Unable to create logFile: ", err)
|
log.Fatal("Unable to create logFile: ", err)
|
||||||
|
|
|
@ -3,6 +3,7 @@ package elektronLogging
|
||||||
import (
|
import (
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -40,7 +41,7 @@ func (sLog *SchedTraceLogger) SetLogFile(prefix string) {
|
||||||
schedTraceLogPrefix := strings.Join([]string{prefix, config.SchedTraceConfig.FilenameExtension}, "")
|
schedTraceLogPrefix := strings.Join([]string{prefix, config.SchedTraceConfig.FilenameExtension}, "")
|
||||||
dirName := logDir.getDirName()
|
dirName := logDir.getDirName()
|
||||||
if dirName != "" {
|
if dirName != "" {
|
||||||
schedTraceLogPrefix = strings.Join([]string{dirName, schedTraceLogPrefix}, "/")
|
schedTraceLogPrefix = filepath.Join(dirName, schedTraceLogPrefix)
|
||||||
}
|
}
|
||||||
if logFile, err := os.Create(schedTraceLogPrefix); err != nil {
|
if logFile, err := os.Create(schedTraceLogPrefix); err != nil {
|
||||||
log.Fatal("Unable to create logFile: ", err)
|
log.Fatal("Unable to create logFile: ", err)
|
||||||
|
|
|
@ -3,6 +3,7 @@ package elektronLogging
|
||||||
import (
|
import (
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"os"
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -40,7 +41,7 @@ func (sLog *SchedWindowLogger) SetLogFile(prefix string) {
|
||||||
schedWindowLogPrefix := strings.Join([]string{prefix, config.SchedWindowConfig.FilenameExtension}, "")
|
schedWindowLogPrefix := strings.Join([]string{prefix, config.SchedWindowConfig.FilenameExtension}, "")
|
||||||
dirName := logDir.getDirName()
|
dirName := logDir.getDirName()
|
||||||
if dirName != "" {
|
if dirName != "" {
|
||||||
schedWindowLogPrefix = strings.Join([]string{dirName, schedWindowLogPrefix}, "/")
|
schedWindowLogPrefix = filepath.Join(dirName, schedWindowLogPrefix)
|
||||||
}
|
}
|
||||||
if logFile, err := os.Create(schedWindowLogPrefix); err != nil {
|
if logFile, err := os.Create(schedWindowLogPrefix); err != nil {
|
||||||
log.Fatal("Unable to create logFile: ", err)
|
log.Fatal("Unable to create logFile: ", err)
|
||||||
|
|
Reference in a new issue