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

Code Refactoring and modifications

Browse source
This commit is contained in:
balandi1 2019-11-21 18:04:59 -05:00
parent eaac82ceb9
commit 370a490643
9 changed files with 75 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

17
elektronLogging/clsfnTaskDistOverheadLogger.go
View file

@ -18,7 +18,7 @@ func NewClsfnTaskDistrOverheadLogger(logType int, prefix string) *ClsfnTaskDistr
return cLog return cLog
} }
func (cLog *ClsfnTaskDistrOverheadLogger) 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)
@ -38,15 +38,14 @@ func (cLog *ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, logD
func (cLog *ClsfnTaskDistrOverheadLogger) SetLogFile(prefix string) { func (cLog *ClsfnTaskDistrOverheadLogger) SetLogFile(prefix string) {
tskDistLogPrefix := strings.Join([]string{prefix, config.TaskDistConfig.FilenameExtension}, "") filename := strings.Join([]string{prefix, config.TaskDistrConfig.FilenameExtension}, "")
dirName := logDir.getDirName() dirName := logDir.getDirName()
if dirName != "" { if dirName != "" {
tskDistLogPrefix = filepath.Join(dirName, tskDistLogPrefix) if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
} log.Fatal("Unable to create logFile: ", err)
if logFile, err := os.Create(tskDistLogPrefix); err != nil { } else {
log.Fatal("Unable to create logFile: ", err) cLog.LogFileName = logFile
} else { cLog.AllowOnConsole = config.TaskDistrConfig.AllowOnConsole
cLog.LogFileName = logFile }
cLog.AllowOnConsole = config.TaskDistConfig.AllowOnConsole
} }
} }

17
elektronLogging/consoleLogger.go
View file

@ -17,7 +17,7 @@ func NewConsoleLogger(logType int, prefix string) *ConsoleLogger {
cLog.SetLogFile(prefix) cLog.SetLogFile(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) {
if logType <= cLog.Type { if logType <= cLog.Type {
logger.SetLevel(level) logger.SetLevel(level)
@ -35,15 +35,14 @@ func (cLog *ConsoleLogger) Log(logType int, level log.Level, logData log.Fields,
func (cLog *ConsoleLogger) SetLogFile(prefix string) { func (cLog *ConsoleLogger) SetLogFile(prefix string) {
consoleLogPrefix := strings.Join([]string{prefix, config.ConsoleConfig.FilenameExtension}, "") filename := strings.Join([]string{prefix, config.ConsoleConfig.FilenameExtension}, "")
dirName := logDir.getDirName() dirName := logDir.getDirName()
if dirName != "" { if dirName != "" {
consoleLogPrefix = filepath.Join(dirName, consoleLogPrefix) if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
} log.Fatal("Unable to create logFile: ", err)
if logFile, err := os.Create(consoleLogPrefix); err != nil { } else {
log.Fatal("Unable to create logFile: ", err) cLog.LogFileName = logFile
} else { cLog.AllowOnConsole = config.ConsoleConfig.AllowOnConsole
cLog.LogFileName = logFile }
cLog.AllowOnConsole = true
} }
} }

1
elektronLogging/createLogDir.go
View file

@ -20,6 +20,7 @@ func (logD *logDirectory) createLogDir(prefix string, startTime time.Time) {
if logD.name == "" { if logD.name == "" {
// Creating directory to store all logs for this run // Creating directory to store all logs for this run
// directory name format - 2019-November-21_14-33-0
logDirName := strings.Join([]string{"./", prefix, strconv.Itoa(startTime.Year())}, "") logDirName := strings.Join([]string{"./", prefix, strconv.Itoa(startTime.Year())}, "")
logDirName = strings.Join([]string{logDirName, startTime.Month().String(), strconv.Itoa(startTime.Day())}, "-") logDirName = strings.Join([]string{logDirName, startTime.Month().String(), strconv.Itoa(startTime.Day())}, "-")
logDirName = strings.Join([]string{logDirName, strconv.Itoa(startTime.Hour())}, "_") logDirName = strings.Join([]string{logDirName, strconv.Itoa(startTime.Hour())}, "_")

51
elektronLogging/loggerConfig.go
View file

@ -9,45 +9,40 @@ import (
type LoggerConfig struct { type LoggerConfig struct {
SchedTraceConfig struct { SchedTraceConfig struct {
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
FilenameExtension string `yaml:"filenameExtension"` FilenameExtension string `yaml:"filenameExtension"`
EnableColumnHeaders bool `yaml:"enableColumnHeaders"` AllowOnConsole bool `yaml:"allowOnConsole"`
AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"schedTrace"` } `yaml:"schedTrace"`
PCPConfig struct { PCPConfig struct {
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
FilenameExtension string `yaml:"filenameExtension"` FilenameExtension string `yaml:"filenameExtension"`
EnableColumnHeaders bool `yaml:"enableColumnHeaders"` AllowOnConsole bool `yaml:"allowOnConsole"`
AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"pcp"` } `yaml:"pcp"`
ConsoleConfig struct { ConsoleConfig struct {
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
FilenameExtension string `yaml:"filenameExtension"` FilenameExtension string `yaml:"filenameExtension"`
EnableColumnHeaders bool `yaml:"enableColumnHeaders"` MinLogLevel string `yaml:"minLogLevel"`
MinLogLevel string `yaml:"minLogLevel"` AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"console"` } `yaml:"console"`
SPSConfig struct { SPSConfig struct {
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
FilenameExtension string `yaml:"filenameExtension"` FilenameExtension string `yaml:"filenameExtension"`
EnableColumnHeaders bool `yaml:"enableColumnHeaders"` AllowOnConsole bool `yaml:"allowOnConsole"`
AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"sps"` } `yaml:"sps"`
TaskDistConfig struct { TaskDistrConfig struct {
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
FilenameExtension string `yaml:"filenameExtension"` FilenameExtension string `yaml:"filenameExtension"`
EnableColumnHeaders bool `yaml:"enableColumnHeaders"` AllowOnConsole bool `yaml:"allowOnConsole"`
AllowOnConsole bool `yaml:"allowOnConsole"` } `yaml:"clsfnTaskDistrOverhead"`
} `yaml:"clsfnTaskDistOverhead"`
SchedWindowConfig struct { SchedWindowConfig struct {
Enabled bool `yaml:"enabled"` Enabled bool `yaml:"enabled"`
FilenameExtension string `yaml:"filenameExtension"` FilenameExtension string `yaml:"filenameExtension"`
EnableColumnHeaders bool `yaml:"enableColumnHeaders"` AllowOnConsole bool `yaml:"allowOnConsole"`
AllowOnConsole bool `yaml:"allowOnConsole"`
} `yaml:"schedWindow"` } `yaml:"schedWindow"`
Format []string `yaml:"format"` Format []string `yaml:"format"`
@ -57,11 +52,11 @@ func (c *LoggerConfig) GetConfig() *LoggerConfig {
yamlFile, err := ioutil.ReadFile(elekEnv.LogConfigYaml) yamlFile, err := ioutil.ReadFile(elekEnv.LogConfigYaml)
if err != nil { if err != nil {
log.Printf("yamlFile.Get err #%v ", err) log.Printf("Error in reading yaml file #%v ", err)
} }
err = yaml.Unmarshal(yamlFile, c) err = yaml.Unmarshal(yamlFile, c)
if err != nil { if err != nil {
log.Fatalf("Unmarshal: %v", err) log.Fatalf("Error in yaml unmarshal: %v", err)
} }
return c return c

19
elektronLogging/pcpLogger.go
View file

@ -18,7 +18,7 @@ func NewPcpLogger(logType int, prefix string) *PcpLogger {
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)
@ -36,17 +36,16 @@ func (pLog *PcpLogger) Log(logType int, level log.Level, logData log.Fields, mes
} }
} }
func (plog *PcpLogger) SetLogFile(prefix string) { func (pLog *PcpLogger) SetLogFile(prefix string) {
pcpLogPrefix := strings.Join([]string{prefix, config.PCPConfig.FilenameExtension}, "") filename := strings.Join([]string{prefix, config.PCPConfig.FilenameExtension}, "")
dirName := logDir.getDirName() dirName := logDir.getDirName()
if dirName != "" { if dirName != "" {
pcpLogPrefix = filepath.Join(dirName, pcpLogPrefix) if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
} log.Fatal("Unable to create logFile: ", err)
if logFile, err := os.Create(pcpLogPrefix); err != nil { } else {
log.Fatal("Unable to create logFile: ", err) pLog.LogFileName = logFile
} else { pLog.AllowOnConsole = config.PCPConfig.AllowOnConsole
plog.LogFileName = logFile }
plog.AllowOnConsole = config.PCPConfig.AllowOnConsole
} }
} }

17
elektronLogging/schedPolicySwitchLogger.go
View file

@ -18,7 +18,7 @@ func NewSchedPolicySwitchLogger(logType int, prefix string) *SchedPolicySwitchLo
return sLog return sLog
} }
func (sLog *SchedPolicySwitchLogger) Log(logType int, level log.Level, logData log.Fields, message string) { func (sLog SchedPolicySwitchLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if sLog.Type == logType { if sLog.Type == logType {
logger.SetLevel(level) logger.SetLevel(level)
@ -38,15 +38,14 @@ func (sLog *SchedPolicySwitchLogger) Log(logType int, level log.Level, logData l
func (sLog *SchedPolicySwitchLogger) SetLogFile(prefix string) { func (sLog *SchedPolicySwitchLogger) SetLogFile(prefix string) {
spsLogPrefix := strings.Join([]string{prefix, config.SPSConfig.FilenameExtension}, "") filename := strings.Join([]string{prefix, config.SPSConfig.FilenameExtension}, "")
dirName := logDir.getDirName() dirName := logDir.getDirName()
if dirName != "" { if dirName != "" {
spsLogPrefix = filepath.Join(dirName, spsLogPrefix) if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
} log.Fatal("Unable to create logFile: ", err)
if logFile, err := os.Create(spsLogPrefix); err != nil { } else {
log.Fatal("Unable to create logFile: ", err) sLog.LogFileName = logFile
} else { sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole
sLog.LogFileName = logFile }
sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole
} }
} }

17
elektronLogging/schedTraceLogger.go
View file

@ -18,7 +18,7 @@ func NewSchedTraceLogger(logType int, prefix string) *SchedTraceLogger {
return sLog return sLog
} }
func (sLog *SchedTraceLogger) Log(logType int, level log.Level, logData log.Fields, message string) { func (sLog SchedTraceLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if sLog.Type == logType { if sLog.Type == logType {
logger.SetLevel(level) logger.SetLevel(level)
@ -38,15 +38,14 @@ func (sLog *SchedTraceLogger) Log(logType int, level log.Level, logData log.Fiel
func (sLog *SchedTraceLogger) SetLogFile(prefix string) { func (sLog *SchedTraceLogger) SetLogFile(prefix string) {
schedTraceLogPrefix := strings.Join([]string{prefix, config.SchedTraceConfig.FilenameExtension}, "") filename := strings.Join([]string{prefix, config.SchedTraceConfig.FilenameExtension}, "")
dirName := logDir.getDirName() dirName := logDir.getDirName()
if dirName != "" { if dirName != "" {
schedTraceLogPrefix = filepath.Join(dirName, schedTraceLogPrefix) if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
} log.Fatal("Unable to create logFile: ", err)
if logFile, err := os.Create(schedTraceLogPrefix); err != nil { } else {
log.Fatal("Unable to create logFile: ", err) sLog.LogFileName = logFile
} else { sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole
sLog.LogFileName = logFile }
sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole
} }
} }

17
elektronLogging/schedWindowLogger.go
View file

@ -18,7 +18,7 @@ func NewSchedWindowLogger(logType int, prefix string) *SchedWindowLogger {
return sLog return sLog
} }
func (sLog *SchedWindowLogger) Log(logType int, level log.Level, logData log.Fields, message string) { func (sLog SchedWindowLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if sLog.Type == logType { if sLog.Type == logType {
logger.SetLevel(level) logger.SetLevel(level)
@ -38,15 +38,14 @@ func (sLog *SchedWindowLogger) Log(logType int, level log.Level, logData log.Fie
func (sLog *SchedWindowLogger) SetLogFile(prefix string) { func (sLog *SchedWindowLogger) SetLogFile(prefix string) {
schedWindowLogPrefix := strings.Join([]string{prefix, config.SchedWindowConfig.FilenameExtension}, "") filename := strings.Join([]string{prefix, config.SchedWindowConfig.FilenameExtension}, "")
dirName := logDir.getDirName() dirName := logDir.getDirName()
if dirName != "" { if dirName != "" {
schedWindowLogPrefix = filepath.Join(dirName, schedWindowLogPrefix) if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
} log.Fatal("Unable to create logFile: ", err)
if logFile, err := os.Create(schedWindowLogPrefix); err != nil { } else {
log.Fatal("Unable to create logFile: ", err) sLog.LogFileName = logFile
} else { sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole
sLog.LogFileName = logFile }
sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole
} }
} }

10
logConfig.yaml
View file

@ -1,36 +1,30 @@
schedTrace: schedTrace:
enabled: true enabled: true
filenameExtension: _schedTrace.log filenameExtension: _schedTrace.log
enablecolumnheaders: true
allowOnConsole: true allowOnConsole: true
sps: sps:
enabled: false enabled: false
filenameExtension: _schedPolicySwitch.log filenameExtension: _schedPolicySwitch.log
enableColumnHeaders: true
allowOnConsole: true allowOnConsole: true
console: console:
enabled: true enabled: true
filenameExtension: _console.log filenameExtension: _console.log
minLogLevel: debug minLogLevel: debug
enableColumnHeaders: true allowOnConsole: true
pcp: pcp:
enabled: true enabled: true
filenameExtension: .pcplog filenameExtension: .pcplog
enableColumnHeaders: true
allowOnConsole: false allowOnConsole: false
schedWindow: schedWindow:
enabled: true enabled: true
filenameExtension: _schedWindow.log filenameExtension: _schedWindow.log
enableColumnHeaders: true
allowOnConsole: true allowOnConsole: true
clsfnTaskDistOverhead: clsfnTaskDistrOverhead:
enabled: true enabled: true
filenameExtension: _classificationOverhead.log filenameExtension: _classificationOverhead.log
enableColumnHeaders: true
allowOnConsole: true allowOnConsole: true
# format.
format: format:
- level - level
- timestamp - timestamp