From c91416164318eb07fac3e417d9c99750fdda54e8 Mon Sep 17 00:00:00 2001 From: balandi1 Date: Wed, 4 Dec 2019 14:08:17 -0500 Subject: [PATCH] Minor bug fixes --- .../clsfnTaskDistOverheadLogger.go | 35 +++++++++--------- elektronLogging/consoleLogger.go | 37 +++++++++---------- elektronLogging/createLogDir.go | 3 +- elektronLogging/logger.go | 2 +- elektronLogging/pcpLogger.go | 35 +++++++++--------- elektronLogging/schedPolicySwitchLogger.go | 35 +++++++++--------- elektronLogging/schedTraceLogger.go | 35 +++++++++--------- elektronLogging/schedWindowLogger.go | 35 +++++++++--------- elektronLogging/types/types.go | 2 +- schedulers/base.go | 2 +- 10 files changed, 108 insertions(+), 113 deletions(-) diff --git a/elektronLogging/clsfnTaskDistOverheadLogger.go b/elektronLogging/clsfnTaskDistOverheadLogger.go index 6d0823f..6565211 100644 --- a/elektronLogging/clsfnTaskDistOverheadLogger.go +++ b/elektronLogging/clsfnTaskDistOverheadLogger.go @@ -22,9 +22,8 @@ func NewClsfnTaskDistrOverheadLogger(b *baseLogData, logType int, prefix string) } func (cLog ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, message string) { - if config.TaskDistrConfig.Enabled { - if cLog.Type == logType { - + if cLog.Type == logType { + if config.TaskDistrConfig.Enabled { if cLog.AllowOnConsole { logger.SetOutput(os.Stdout) logger.WithFields(cLog.data).Log(level, message) @@ -33,19 +32,19 @@ func (cLog ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, messa logger.SetOutput(cLog.LogFile) logger.WithFields(cLog.data).Log(level, message) } - if cLog.next != nil { - cLog.next.Log(logType, level, message) - } else { - // Clearing the fields. - cLog.resetFields() - } + } + // Forwarding to next logger + if cLog.next != nil { + cLog.next.Log(logType, level, message) + } else { + // Clearing the fields. + cLog.resetFields() } } func (cLog ClsfnTaskDistrOverheadLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { - if config.TaskDistrConfig.Enabled { - if cLog.Type == logType { - + if cLog.Type == logType { + if config.TaskDistrConfig.Enabled { if cLog.AllowOnConsole { logger.SetOutput(os.Stdout) logger.WithFields(cLog.data).Logf(level, msgFmtString, args...) @@ -54,12 +53,12 @@ func (cLog ClsfnTaskDistrOverheadLogger) Logf(logType int, level log.Level, msgF logger.SetOutput(cLog.LogFile) logger.WithFields(cLog.data).Logf(level, msgFmtString, args...) } - if cLog.next != nil { - cLog.next.Logf(logType, level, msgFmtString, args...) - } else { - // Clearing the fields. - cLog.resetFields() - } + } + if cLog.next != nil { + cLog.next.Logf(logType, level, msgFmtString, args...) + } else { + // Clearing the fields. + cLog.resetFields() } } diff --git a/elektronLogging/consoleLogger.go b/elektronLogging/consoleLogger.go index b1b9eda..64b20ea 100644 --- a/elektronLogging/consoleLogger.go +++ b/elektronLogging/consoleLogger.go @@ -21,45 +21,44 @@ func NewConsoleLogger(b *baseLogData, logType int, prefix string) *ConsoleLogger return cLog } func (cLog ConsoleLogger) Log(logType int, level log.Level, message string) { - if config.ConsoleConfig.Enabled { - if logType <= cLog.Type { - + if logType <= cLog.Type { + if config.ConsoleConfig.Enabled { logger.SetOutput(os.Stdout) logger.WithFields(cLog.data).Log(level, message) logger.SetOutput(cLog.LogFile) logger.WithFields(cLog.data).Log(level, message) } - if cLog.next != nil { - cLog.next.Log(logType, level, message) - } else { - // Clearing the fields. - cLog.resetFields() - } + } + // Forwarding to next logger. + if cLog.next != nil { + cLog.next.Log(logType, level, message) + } else { + // Clearing the fields. + cLog.resetFields() } } func (cLog ConsoleLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { - if config.ConsoleConfig.Enabled { - if logType <= cLog.Type { - + if logType <= cLog.Type { + if config.ConsoleConfig.Enabled { logger.SetOutput(os.Stdout) logger.WithFields(cLog.data).Logf(level, msgFmtString, args...) logger.SetOutput(cLog.LogFile) logger.WithFields(cLog.data).Logf(level, msgFmtString, args...) } - if cLog.next != nil { - cLog.next.Logf(logType, level, msgFmtString, args...) - } else { - // Clearing the fields. - cLog.resetFields() - } + } + if cLog.next != nil { + cLog.next.Logf(logType, level, msgFmtString, args...) + } else { + // Clearing the fields. + cLog.resetFields() } } func (cLog *ConsoleLogger) CreateLogFile(prefix string) { - + // Create log file for the type if it is enabled. if config.ConsoleConfig.Enabled { filename := strings.Join([]string{prefix, config.ConsoleConfig.FilenameExtension}, "") dirName := logDir.getDirName() diff --git a/elektronLogging/createLogDir.go b/elektronLogging/createLogDir.go index c40abbc..b5666d9 100644 --- a/elektronLogging/createLogDir.go +++ b/elektronLogging/createLogDir.go @@ -20,7 +20,8 @@ func (logD *logDirectory) getDirName() string { func (logD *logDirectory) createLogDir(prefix string, startTime time.Time) { if logD.name == "" { - // Creating directory to store all logs for this run. Directory name format - 2019-November-21_14-33-0. + // Creating directory to store all logs for this run. Directory name format : _2019-November-21_14-33-0. + prefix = prefix + "_" 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, strconv.Itoa(startTime.Hour())}, "_") diff --git a/elektronLogging/logger.go b/elektronLogging/logger.go index 44f70ee..bdf07ea 100644 --- a/elektronLogging/logger.go +++ b/elektronLogging/logger.go @@ -42,7 +42,7 @@ func BuildLogger(prefix string, logConfigFilename string) { schedTraceLog := NewSchedTraceLogger(b, SCHED_TRACE, prefix) spsLog := NewSchedPolicySwitchLogger(b, SPS, prefix) schedWindowLog := NewSchedWindowLogger(b, SCHED_WINDOW, prefix) - tskDistLog := NewClsfnTaskDistrOverheadLogger(b, CLSFN_TASKDIST_OVERHEAD, prefix) + tskDistLog := NewClsfnTaskDistrOverheadLogger(b, CLSFN_TASKDISTR_OVERHEAD, prefix) head.SetNext(cLog) cLog.SetNext(pLog) diff --git a/elektronLogging/pcpLogger.go b/elektronLogging/pcpLogger.go index 022e885..192eb88 100644 --- a/elektronLogging/pcpLogger.go +++ b/elektronLogging/pcpLogger.go @@ -22,9 +22,8 @@ func NewPCPLogger(b *baseLogData, logType int, prefix string) *PCPLogger { } func (pLog PCPLogger) Log(logType int, level log.Level, message string) { - if config.PCPConfig.Enabled { - if pLog.Type == logType { - + if pLog.Type == logType { + if config.PCPConfig.Enabled { if pLog.AllowOnConsole { logger.SetOutput(os.Stdout) logger.WithFields(pLog.data).Log(level, message) @@ -33,19 +32,18 @@ func (pLog PCPLogger) Log(logType int, level log.Level, message string) { logger.SetOutput(pLog.LogFile) logger.WithFields(pLog.data).Log(level, message) } - if pLog.next != nil { - pLog.next.Log(logType, level, message) - } else { - // Clearing the fields. - pLog.resetFields() - } + } + if pLog.next != nil { + pLog.next.Log(logType, level, message) + } else { + // Clearing the fields. + pLog.resetFields() } } func (pLog PCPLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { - if config.PCPConfig.Enabled { - if pLog.Type == logType { - + if pLog.Type == logType { + if config.PCPConfig.Enabled { if pLog.AllowOnConsole { logger.SetOutput(os.Stdout) logger.WithFields(pLog.data).Logf(level, msgFmtString, args...) @@ -54,12 +52,13 @@ func (pLog PCPLogger) Logf(logType int, level log.Level, msgFmtString string, ar logger.SetOutput(pLog.LogFile) logger.WithFields(pLog.data).Logf(level, msgFmtString, args...) } - if pLog.next != nil { - pLog.next.Logf(logType, level, msgFmtString, args...) - } else { - // Clearing the fields. - pLog.resetFields() - } + } + // Forwarding to next logger + if pLog.next != nil { + pLog.next.Logf(logType, level, msgFmtString, args...) + } else { + // Clearing the fields. + pLog.resetFields() } } diff --git a/elektronLogging/schedPolicySwitchLogger.go b/elektronLogging/schedPolicySwitchLogger.go index b13cc5b..8d85d2f 100644 --- a/elektronLogging/schedPolicySwitchLogger.go +++ b/elektronLogging/schedPolicySwitchLogger.go @@ -22,9 +22,8 @@ func NewSchedPolicySwitchLogger(b *baseLogData, logType int, prefix string) *Sch } func (sLog SchedPolicySwitchLogger) Log(logType int, level log.Level, message string) { - if config.SPSConfig.Enabled { - if sLog.Type == logType { - + if sLog.Type == logType { + if config.SPSConfig.Enabled { if sLog.AllowOnConsole { logger.SetOutput(os.Stdout) logger.WithFields(sLog.data).Log(level, message) @@ -33,19 +32,18 @@ func (sLog SchedPolicySwitchLogger) Log(logType int, level log.Level, message st logger.SetOutput(sLog.LogFile) logger.WithFields(sLog.data).Log(level, message) } - if sLog.next != nil { - sLog.next.Log(logType, level, message) - } else { - // Clearing the fields. - sLog.resetFields() - } + } + if sLog.next != nil { + sLog.next.Log(logType, level, message) + } else { + // Clearing the fields. + sLog.resetFields() } } func (sLog SchedPolicySwitchLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { - if config.SPSConfig.Enabled { - if sLog.Type == logType { - + if sLog.Type == logType { + if config.SPSConfig.Enabled { if sLog.AllowOnConsole { logger.SetOutput(os.Stdout) logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) @@ -54,12 +52,13 @@ func (sLog SchedPolicySwitchLogger) Logf(logType int, level log.Level, msgFmtStr logger.SetOutput(sLog.LogFile) logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) } - if sLog.next != nil { - sLog.next.Logf(logType, level, msgFmtString, args...) - } else { - // Clearing the fields. - sLog.resetFields() - } + } + // Forwarding to next logger + if sLog.next != nil { + sLog.next.Logf(logType, level, msgFmtString, args...) + } else { + // Clearing the fields. + sLog.resetFields() } } diff --git a/elektronLogging/schedTraceLogger.go b/elektronLogging/schedTraceLogger.go index 2a429dd..838eff7 100644 --- a/elektronLogging/schedTraceLogger.go +++ b/elektronLogging/schedTraceLogger.go @@ -22,9 +22,8 @@ func NewSchedTraceLogger(b *baseLogData, logType int, prefix string) *SchedTrace } func (sLog SchedTraceLogger) Log(logType int, level log.Level, message string) { - if config.SchedTraceConfig.Enabled { - if sLog.Type == logType { - + if sLog.Type == logType { + if config.SchedTraceConfig.Enabled { if sLog.AllowOnConsole { logger.SetOutput(os.Stdout) logger.WithFields(sLog.data).Log(level, message) @@ -33,19 +32,18 @@ func (sLog SchedTraceLogger) Log(logType int, level log.Level, message string) { logger.SetOutput(sLog.LogFile) logger.WithFields(sLog.data).Log(level, message) } - if sLog.next != nil { - sLog.next.Log(logType, level, message) - } else { - // Clearing the fields. - sLog.resetFields() - } + } + if sLog.next != nil { + sLog.next.Log(logType, level, message) + } else { + // Clearing the fields. + sLog.resetFields() } } func (sLog SchedTraceLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { - if config.SchedTraceConfig.Enabled { - if sLog.Type == logType { - + if sLog.Type == logType { + if config.SchedTraceConfig.Enabled { if sLog.AllowOnConsole { logger.SetOutput(os.Stdout) logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) @@ -54,12 +52,13 @@ func (sLog SchedTraceLogger) Logf(logType int, level log.Level, msgFmtString str logger.SetOutput(sLog.LogFile) logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) } - if sLog.next != nil { - sLog.next.Logf(logType, level, msgFmtString, args...) - } else { - // Clearing the fields. - sLog.resetFields() - } + } + // Forwarding to next logger + if sLog.next != nil { + sLog.next.Logf(logType, level, msgFmtString, args...) + } else { + // Clearing the fields. + sLog.resetFields() } } diff --git a/elektronLogging/schedWindowLogger.go b/elektronLogging/schedWindowLogger.go index d7c1895..e8d6958 100644 --- a/elektronLogging/schedWindowLogger.go +++ b/elektronLogging/schedWindowLogger.go @@ -22,9 +22,8 @@ func NewSchedWindowLogger(b *baseLogData, logType int, prefix string) *SchedWind } func (sLog SchedWindowLogger) Log(logType int, level log.Level, message string) { - if config.SchedWindowConfig.Enabled { - if sLog.Type == logType { - + if sLog.Type == logType { + if config.SchedWindowConfig.Enabled { if sLog.AllowOnConsole { logger.SetOutput(os.Stdout) logger.WithFields(sLog.data).Log(level, message) @@ -33,19 +32,19 @@ func (sLog SchedWindowLogger) Log(logType int, level log.Level, message string) logger.SetOutput(sLog.LogFile) logger.WithFields(sLog.data).Log(level, message) } - if sLog.next != nil { - sLog.next.Log(logType, level, message) - } else { - // Clearing the fields. - sLog.resetFields() - } + } + // Forwarding to next logger + if sLog.next != nil { + sLog.next.Log(logType, level, message) + } else { + // Clearing the fields. + sLog.resetFields() } } func (sLog SchedWindowLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { - if config.SchedWindowConfig.Enabled { - if sLog.Type == logType { - + if sLog.Type == logType { + if config.SchedWindowConfig.Enabled { if sLog.AllowOnConsole { logger.SetOutput(os.Stdout) logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) @@ -54,12 +53,12 @@ func (sLog SchedWindowLogger) Logf(logType int, level log.Level, msgFmtString st logger.SetOutput(sLog.LogFile) logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) } - if sLog.next != nil { - sLog.next.Logf(logType, level, msgFmtString, args...) - } else { - // Clearing the fields. - sLog.resetFields() - } + } + if sLog.next != nil { + sLog.next.Logf(logType, level, msgFmtString, args...) + } else { + // Clearing the fields. + sLog.resetFields() } } diff --git a/elektronLogging/types/types.go b/elektronLogging/types/types.go index 7e99836..903fe34 100644 --- a/elektronLogging/types/types.go +++ b/elektronLogging/types/types.go @@ -6,5 +6,5 @@ const ( SCHED_TRACE SPS SCHED_WINDOW - CLSFN_TASKDIST_OVERHEAD + CLSFN_TASKDISTR_OVERHEAD ) diff --git a/schedulers/base.go b/schedulers/base.go index 065a903..25f06a9 100644 --- a/schedulers/base.go +++ b/schedulers/base.go @@ -375,5 +375,5 @@ func (s *BaseScheduler) LogSchedPolicySwitch(name string, nextPolicy SchedPolicy func (s *BaseScheduler) LogClsfnAndTaskDistOverhead(overhead time.Duration) { // Logging the overhead in microseconds. - elekLog.ElektronLogger.WithFields(log.Fields{"Overhead in microseconds": fmt.Sprintf("%f", float64(overhead.Nanoseconds())/1000.0)}).Log(elekLogTypes.CLSFN_TASKDIST_OVERHEAD, log.InfoLevel, "") + elekLog.ElektronLogger.WithFields(log.Fields{"Overhead in microseconds": fmt.Sprintf("%f", float64(overhead.Nanoseconds())/1000.0)}).Log(elekLogTypes.CLSFN_TASKDISTR_OVERHEAD, log.InfoLevel, "") }