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

Refactoring Code

Browse source 
Renamed PcpLogger, SetLogFile(), LogFileName. Changed error messages in loggerConfig.
This commit is contained in:
balandi1 2019-11-26 12:48:48 -05:00
parent 370a490643
commit ef6d154d06
9 changed files with 32 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
elektronLogging/clsfnTaskDistOverheadLogger.go
View file

@ -14,7 +14,7 @@ type ClsfnTaskDistrOverheadLogger struct {
func NewClsfnTaskDistrOverheadLogger(logType int, prefix string) *ClsfnTaskDistrOverheadLogger { func NewClsfnTaskDistrOverheadLogger(logType int, prefix string) *ClsfnTaskDistrOverheadLogger {
cLog := &ClsfnTaskDistrOverheadLogger{} cLog := &ClsfnTaskDistrOverheadLogger{}
cLog.Type = logType cLog.Type = logType
cLog.SetLogFile(prefix) cLog.CreateLogFile(prefix)
return cLog return cLog
} }
@ -28,7 +28,7 @@ func (cLog ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, logDa
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
logger.SetOutput(cLog.LogFileName) logger.SetOutput(cLog.LogFile)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
if cLog.next != nil { if cLog.next != nil {
@ -36,7 +36,7 @@ func (cLog ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, logDa
} }
} }
func (cLog *ClsfnTaskDistrOverheadLogger) SetLogFile(prefix string) { func (cLog *ClsfnTaskDistrOverheadLogger) CreateLogFile(prefix string) {
filename := strings.Join([]string{prefix, config.TaskDistrConfig.FilenameExtension}, "") filename := strings.Join([]string{prefix, config.TaskDistrConfig.FilenameExtension}, "")
dirName := logDir.getDirName() dirName := logDir.getDirName()
@ -44,7 +44,7 @@ func (cLog *ClsfnTaskDistrOverheadLogger) SetLogFile(prefix string) {
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
log.Fatal("Unable to create logFile: ", err) log.Fatal("Unable to create logFile: ", err)
} else { } else {
cLog.LogFileName = logFile cLog.LogFile = logFile
cLog.AllowOnConsole = config.TaskDistrConfig.AllowOnConsole cLog.AllowOnConsole = config.TaskDistrConfig.AllowOnConsole
} }
} }

8
elektronLogging/consoleLogger.go
View file

@ -14,7 +14,7 @@ type ConsoleLogger struct {
func NewConsoleLogger(logType int, prefix string) *ConsoleLogger { func NewConsoleLogger(logType int, prefix string) *ConsoleLogger {
cLog := &ConsoleLogger{} cLog := &ConsoleLogger{}
cLog.Type = logType cLog.Type = logType
cLog.SetLogFile(prefix) cLog.CreateLogFile(prefix)
return cLog return cLog
} }
func (cLog ConsoleLogger) Log(logType int, level log.Level, logData log.Fields, message string) { func (cLog ConsoleLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
@ -25,7 +25,7 @@ func (cLog ConsoleLogger) Log(logType int, level log.Level, logData log.Fields,
logger.SetOutput(os.Stdout) logger.SetOutput(os.Stdout)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
logger.SetOutput(cLog.LogFileName) logger.SetOutput(cLog.LogFile)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
if cLog.next != nil { if cLog.next != nil {
@ -33,7 +33,7 @@ func (cLog ConsoleLogger) Log(logType int, level log.Level, logData log.Fields,
} }
} }
func (cLog *ConsoleLogger) SetLogFile(prefix string) { func (cLog *ConsoleLogger) CreateLogFile(prefix string) {
filename := strings.Join([]string{prefix, config.ConsoleConfig.FilenameExtension}, "") filename := strings.Join([]string{prefix, config.ConsoleConfig.FilenameExtension}, "")
dirName := logDir.getDirName() dirName := logDir.getDirName()
@ -41,7 +41,7 @@ func (cLog *ConsoleLogger) SetLogFile(prefix string) {
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
log.Fatal("Unable to create logFile: ", err) log.Fatal("Unable to create logFile: ", err)
} else { } else {
cLog.LogFileName = logFile cLog.LogFile = logFile
cLog.AllowOnConsole = config.ConsoleConfig.AllowOnConsole cLog.AllowOnConsole = config.ConsoleConfig.AllowOnConsole
} }
} }

2
elektronLogging/logger.go
View file

@ -35,7 +35,7 @@ func BuildLogger(prefix string) {
// create a chain of loggers // create a chain of loggers
head := &LoggerImpl{} head := &LoggerImpl{}
cLog := NewConsoleLogger(CONSOLE, prefix) cLog := NewConsoleLogger(CONSOLE, prefix)
pLog := NewPcpLogger(PCP, prefix) pLog := NewPCPLogger(PCP, prefix)
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)

4
elektronLogging/loggerChain.go
View file

@ -8,12 +8,12 @@ import (
type Logger interface { type Logger interface {
SetNext(logType Logger) SetNext(logType Logger)
Log(logType int, level log.Level, logData log.Fields, message string) Log(logType int, level log.Level, logData log.Fields, message string)
SetLogFile(prefix string) CreateLogFile(prefix string)
} }
type LoggerImpl struct { type LoggerImpl struct {
Type int Type int
AllowOnConsole bool AllowOnConsole bool
LogFileName *os.File LogFile *os.File
next Logger next Logger
} }

2
elektronLogging/loggerConfig.go
View file

@ -56,7 +56,7 @@ func (c *LoggerConfig) GetConfig() *LoggerConfig {
} }
err = yaml.Unmarshal(yamlFile, c) err = yaml.Unmarshal(yamlFile, c)
if err != nil { if err != nil {
log.Fatalf("Error in yaml unmarshal: %v", err) log.Fatalf("Error in unmarshalling yaml: %v", err)
} }
return c return c

16
elektronLogging/pcpLogger.go
View file

@ -7,18 +7,18 @@ import (
"strings" "strings"
) )
type PcpLogger struct { type PCPLogger struct {
LoggerImpl LoggerImpl
} }
func NewPcpLogger(logType int, prefix string) *PcpLogger { func NewPCPLogger(logType int, prefix string) *PCPLogger {
pLog := &PcpLogger{} pLog := &PCPLogger{}
pLog.Type = logType pLog.Type = logType
pLog.SetLogFile(prefix) pLog.CreateLogFile(prefix)
return pLog return pLog
} }
func (pLog PcpLogger) Log(logType int, level log.Level, logData log.Fields, message string) { func (pLog PCPLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if pLog.Type == logType { if pLog.Type == logType {
logger.SetLevel(level) logger.SetLevel(level)
@ -28,7 +28,7 @@ func (pLog PcpLogger) Log(logType int, level log.Level, logData log.Fields, mess
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
logger.SetOutput(pLog.LogFileName) logger.SetOutput(pLog.LogFile)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
if pLog.next != nil { if pLog.next != nil {
@ -36,7 +36,7 @@ func (pLog PcpLogger) Log(logType int, level log.Level, logData log.Fields, mess
} }
} }
func (pLog *PcpLogger) SetLogFile(prefix string) { func (pLog *PCPLogger) CreateLogFile(prefix string) {
filename := strings.Join([]string{prefix, config.PCPConfig.FilenameExtension}, "") filename := strings.Join([]string{prefix, config.PCPConfig.FilenameExtension}, "")
dirName := logDir.getDirName() dirName := logDir.getDirName()
@ -44,7 +44,7 @@ func (pLog *PcpLogger) SetLogFile(prefix string) {
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
log.Fatal("Unable to create logFile: ", err) log.Fatal("Unable to create logFile: ", err)
} else { } else {
pLog.LogFileName = logFile pLog.LogFile = logFile
pLog.AllowOnConsole = config.PCPConfig.AllowOnConsole pLog.AllowOnConsole = config.PCPConfig.AllowOnConsole
} }
} }

8
elektronLogging/schedPolicySwitchLogger.go
View file

@ -14,7 +14,7 @@ type SchedPolicySwitchLogger struct {
func NewSchedPolicySwitchLogger(logType int, prefix string) *SchedPolicySwitchLogger { func NewSchedPolicySwitchLogger(logType int, prefix string) *SchedPolicySwitchLogger {
sLog := &SchedPolicySwitchLogger{} sLog := &SchedPolicySwitchLogger{}
sLog.Type = logType sLog.Type = logType
sLog.SetLogFile(prefix) sLog.CreateLogFile(prefix)
return sLog return sLog
} }
@ -28,7 +28,7 @@ func (sLog SchedPolicySwitchLogger) Log(logType int, level log.Level, logData lo
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
logger.SetOutput(sLog.LogFileName) logger.SetOutput(sLog.LogFile)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
if sLog.next != nil { if sLog.next != nil {
@ -36,7 +36,7 @@ func (sLog SchedPolicySwitchLogger) Log(logType int, level log.Level, logData lo
} }
} }
func (sLog *SchedPolicySwitchLogger) SetLogFile(prefix string) { func (sLog *SchedPolicySwitchLogger) CreateLogFile(prefix string) {
filename := strings.Join([]string{prefix, config.SPSConfig.FilenameExtension}, "") filename := strings.Join([]string{prefix, config.SPSConfig.FilenameExtension}, "")
dirName := logDir.getDirName() dirName := logDir.getDirName()
@ -44,7 +44,7 @@ func (sLog *SchedPolicySwitchLogger) SetLogFile(prefix string) {
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
log.Fatal("Unable to create logFile: ", err) log.Fatal("Unable to create logFile: ", err)
} else { } else {
sLog.LogFileName = logFile sLog.LogFile = logFile
sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole
} }
} }

8
elektronLogging/schedTraceLogger.go
View file

@ -14,7 +14,7 @@ type SchedTraceLogger struct {
func NewSchedTraceLogger(logType int, prefix string) *SchedTraceLogger { func NewSchedTraceLogger(logType int, prefix string) *SchedTraceLogger {
sLog := &SchedTraceLogger{} sLog := &SchedTraceLogger{}
sLog.Type = logType sLog.Type = logType
sLog.SetLogFile(prefix) sLog.CreateLogFile(prefix)
return sLog return sLog
} }
@ -28,7 +28,7 @@ func (sLog SchedTraceLogger) Log(logType int, level log.Level, logData log.Field
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
logger.SetOutput(sLog.LogFileName) logger.SetOutput(sLog.LogFile)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
if sLog.next != nil { if sLog.next != nil {
@ -36,7 +36,7 @@ func (sLog SchedTraceLogger) Log(logType int, level log.Level, logData log.Field
} }
} }
func (sLog *SchedTraceLogger) SetLogFile(prefix string) { func (sLog *SchedTraceLogger) CreateLogFile(prefix string) {
filename := strings.Join([]string{prefix, config.SchedTraceConfig.FilenameExtension}, "") filename := strings.Join([]string{prefix, config.SchedTraceConfig.FilenameExtension}, "")
dirName := logDir.getDirName() dirName := logDir.getDirName()
@ -44,7 +44,7 @@ func (sLog *SchedTraceLogger) SetLogFile(prefix string) {
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
log.Fatal("Unable to create logFile: ", err) log.Fatal("Unable to create logFile: ", err)
} else { } else {
sLog.LogFileName = logFile sLog.LogFile = logFile
sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole
} }
} }

8
elektronLogging/schedWindowLogger.go
View file

@ -14,7 +14,7 @@ type SchedWindowLogger struct {
func NewSchedWindowLogger(logType int, prefix string) *SchedWindowLogger { func NewSchedWindowLogger(logType int, prefix string) *SchedWindowLogger {
sLog := &SchedWindowLogger{} sLog := &SchedWindowLogger{}
sLog.Type = logType sLog.Type = logType
sLog.SetLogFile(prefix) sLog.CreateLogFile(prefix)
return sLog return sLog
} }
@ -28,7 +28,7 @@ func (sLog SchedWindowLogger) Log(logType int, level log.Level, logData log.Fiel
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
logger.SetOutput(sLog.LogFileName) logger.SetOutput(sLog.LogFile)
logger.WithFields(logData).Println(message) logger.WithFields(logData).Println(message)
} }
if sLog.next != nil { if sLog.next != nil {
@ -36,7 +36,7 @@ func (sLog SchedWindowLogger) Log(logType int, level log.Level, logData log.Fiel
} }
} }
func (sLog *SchedWindowLogger) SetLogFile(prefix string) { func (sLog *SchedWindowLogger) CreateLogFile(prefix string) {
filename := strings.Join([]string{prefix, config.SchedWindowConfig.FilenameExtension}, "") filename := strings.Join([]string{prefix, config.SchedWindowConfig.FilenameExtension}, "")
dirName := logDir.getDirName() dirName := logDir.getDirName()
@ -44,7 +44,7 @@ func (sLog *SchedWindowLogger) SetLogFile(prefix string) {
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
log.Fatal("Unable to create logFile: ", err) log.Fatal("Unable to create logFile: ", err)
} else { } else {
sLog.LogFileName = logFile sLog.LogFile = logFile
sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole
} }
} }