spdf/elektron
Archived
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity

Few code improvements and refactoring

Browse source
This commit is contained in:
balandi1 2019-11-21 15:26:57 -05:00
parent cb5df9acc8
commit eaac82ceb9
8 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
def/taskUtils.go
View file

@ -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.

13
elektronLogging/clsfnTaskDistOverheadLogger.go
View file

@ -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)

3
elektronLogging/consoleLogger.go
View file

@ -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)

2
elektronLogging/logger.go
View file

@ -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)

3
elektronLogging/pcpLogger.go
View file

@ -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)

3
elektronLogging/schedPolicySwitchLogger.go
View file

@ -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)

3
elektronLogging/schedTraceLogger.go
View file

@ -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)

3
elektronLogging/schedWindowLogger.go
View file

@ -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)