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

Minor code style fixes

Browse source 
Removed the global logger instance and kept it in LoggerImpl
struct.
Changed access level for members of LoggerImpl.
This commit is contained in:
balandi1 2019-12-04 14:56:48 -05:00
parent c914161643
commit 64ab443d25
8 changed files with 111 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

33
elektronLogging/clsfnTaskDistOverheadLogger.go
View file

@ -12,25 +12,26 @@ type ClsfnTaskDistrOverheadLogger struct {
LoggerImpl LoggerImpl
} }
func NewClsfnTaskDistrOverheadLogger(b *baseLogData, logType int, prefix string) *ClsfnTaskDistrOverheadLogger { func NewClsfnTaskDistrOverheadLogger(b *baseLogData, logType int, prefix string, logger *log.Logger) *ClsfnTaskDistrOverheadLogger {
cLog := &ClsfnTaskDistrOverheadLogger{} cLog := &ClsfnTaskDistrOverheadLogger{}
cLog.Type = logType cLog.logType = logType
cLog.CreateLogFile(prefix) cLog.CreateLogFile(prefix)
cLog.next = nil cLog.next = nil
cLog.baseLogData = b cLog.baseLogData = b
cLog.logger = logger
return cLog return cLog
} }
func (cLog ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, message string) { func (cLog ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, message string) {
if cLog.Type == logType { if cLog.logType == logType {
if config.TaskDistrConfig.Enabled { if config.TaskDistrConfig.Enabled {
if cLog.AllowOnConsole { if cLog.allowOnConsole {
logger.SetOutput(os.Stdout) cLog.logger.SetOutput(os.Stdout)
logger.WithFields(cLog.data).Log(level, message) cLog.logger.WithFields(cLog.data).Log(level, message)
} }
logger.SetOutput(cLog.LogFile) cLog.logger.SetOutput(cLog.logFile)
logger.WithFields(cLog.data).Log(level, message) cLog.logger.WithFields(cLog.data).Log(level, message)
} }
} }
// Forwarding to next logger // Forwarding to next logger
@ -43,15 +44,15 @@ func (cLog ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, messa
} }
func (cLog ClsfnTaskDistrOverheadLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { func (cLog ClsfnTaskDistrOverheadLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
if cLog.Type == logType { if cLog.logType == logType {
if config.TaskDistrConfig.Enabled { if config.TaskDistrConfig.Enabled {
if cLog.AllowOnConsole { if cLog.allowOnConsole {
logger.SetOutput(os.Stdout) cLog.logger.SetOutput(os.Stdout)
logger.WithFields(cLog.data).Logf(level, msgFmtString, args...) cLog.logger.WithFields(cLog.data).Logf(level, msgFmtString, args...)
} }
logger.SetOutput(cLog.LogFile) cLog.logger.SetOutput(cLog.logFile)
logger.WithFields(cLog.data).Logf(level, msgFmtString, args...) cLog.logger.WithFields(cLog.data).Logf(level, msgFmtString, args...)
} }
} }
if cLog.next != nil { if cLog.next != nil {
@ -71,8 +72,8 @@ func (cLog *ClsfnTaskDistrOverheadLogger) CreateLogFile(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.LogFile = logFile cLog.logFile = logFile
cLog.AllowOnConsole = config.TaskDistrConfig.AllowOnConsole cLog.allowOnConsole = config.TaskDistrConfig.AllowOnConsole
} }
} }
} }

29
elektronLogging/consoleLogger.go
View file

@ -12,22 +12,23 @@ type ConsoleLogger struct {
LoggerImpl LoggerImpl
} }
func NewConsoleLogger(b *baseLogData, logType int, prefix string) *ConsoleLogger { func NewConsoleLogger(b *baseLogData, logType int, prefix string, logger *log.Logger) *ConsoleLogger {
cLog := &ConsoleLogger{} cLog := &ConsoleLogger{}
cLog.Type = logType cLog.logType = logType
cLog.CreateLogFile(prefix) cLog.CreateLogFile(prefix)
cLog.next = nil cLog.next = nil
cLog.baseLogData = b cLog.baseLogData = b
cLog.logger = logger
return cLog return cLog
} }
func (cLog ConsoleLogger) Log(logType int, level log.Level, message string) { func (cLog ConsoleLogger) Log(logType int, level log.Level, message string) {
if logType <= cLog.Type { if logType <= cLog.logType {
if config.ConsoleConfig.Enabled { if config.ConsoleConfig.Enabled {
logger.SetOutput(os.Stdout) cLog.logger.SetOutput(os.Stdout)
logger.WithFields(cLog.data).Log(level, message) cLog.logger.WithFields(cLog.data).Log(level, message)
logger.SetOutput(cLog.LogFile) cLog.logger.SetOutput(cLog.logFile)
logger.WithFields(cLog.data).Log(level, message) cLog.logger.WithFields(cLog.data).Log(level, message)
} }
} }
// Forwarding to next logger. // Forwarding to next logger.
@ -40,13 +41,13 @@ func (cLog ConsoleLogger) Log(logType int, level log.Level, message string) {
} }
func (cLog ConsoleLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { func (cLog ConsoleLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
if logType <= cLog.Type { if logType <= cLog.logType {
if config.ConsoleConfig.Enabled { if config.ConsoleConfig.Enabled {
logger.SetOutput(os.Stdout) cLog.logger.SetOutput(os.Stdout)
logger.WithFields(cLog.data).Logf(level, msgFmtString, args...) cLog.logger.WithFields(cLog.data).Logf(level, msgFmtString, args...)
logger.SetOutput(cLog.LogFile) cLog.logger.SetOutput(cLog.logFile)
logger.WithFields(cLog.data).Logf(level, msgFmtString, args...) cLog.logger.WithFields(cLog.data).Logf(level, msgFmtString, args...)
} }
} }
if cLog.next != nil { if cLog.next != nil {
@ -66,8 +67,8 @@ func (cLog *ConsoleLogger) CreateLogFile(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.LogFile = logFile cLog.logFile = logFile
cLog.AllowOnConsole = config.ConsoleConfig.AllowOnConsole cLog.allowOnConsole = config.ConsoleConfig.AllowOnConsole
} }
} }
} }

15
elektronLogging/logger.go
View file

@ -10,7 +10,6 @@ import (
) )
var config LoggerConfig var config LoggerConfig
var logger *log.Logger
var formatter ElektronFormatter var formatter ElektronFormatter
var ElektronLogger *LoggerImpl var ElektronLogger *LoggerImpl
var logDir logDirectory var logDir logDirectory
@ -28,7 +27,7 @@ func BuildLogger(prefix string, logConfigFilename string) {
// Instantiate the logrus instance. // Instantiate the logrus instance.
prefix = strings.Join([]string{prefix, formattedStartTime}, "_") prefix = strings.Join([]string{prefix, formattedStartTime}, "_")
logger = &log.Logger{ logger := &log.Logger{
Out: os.Stderr, Out: os.Stderr,
Level: log.DebugLevel, Level: log.DebugLevel,
Formatter: &formatter, Formatter: &formatter,
@ -37,12 +36,12 @@ func BuildLogger(prefix string, logConfigFilename string) {
// Create a chain of loggers. // Create a chain of loggers.
b := &baseLogData{data: log.Fields{}} b := &baseLogData{data: log.Fields{}}
head := &LoggerImpl{baseLogData: b} head := &LoggerImpl{baseLogData: b}
cLog := NewConsoleLogger(b, CONSOLE, prefix) cLog := NewConsoleLogger(b, CONSOLE, prefix, logger)
pLog := NewPCPLogger(b, PCP, prefix) pLog := NewPCPLogger(b, PCP, prefix, logger)
schedTraceLog := NewSchedTraceLogger(b, SCHED_TRACE, prefix) schedTraceLog := NewSchedTraceLogger(b, SCHED_TRACE, prefix, logger)
spsLog := NewSchedPolicySwitchLogger(b, SPS, prefix) spsLog := NewSchedPolicySwitchLogger(b, SPS, prefix, logger)
schedWindowLog := NewSchedWindowLogger(b, SCHED_WINDOW, prefix) schedWindowLog := NewSchedWindowLogger(b, SCHED_WINDOW, prefix, logger)
tskDistLog := NewClsfnTaskDistrOverheadLogger(b, CLSFN_TASKDISTR_OVERHEAD, prefix) tskDistLog := NewClsfnTaskDistrOverheadLogger(b, CLSFN_TASKDISTR_OVERHEAD, prefix, logger)
head.SetNext(cLog) head.SetNext(cLog)
cLog.SetNext(pLog) cLog.SetNext(pLog)

7
elektronLogging/loggerChain.go
View file

@ -16,10 +16,11 @@ type baseLogData struct {
} }
type LoggerImpl struct { type LoggerImpl struct {
*baseLogData *baseLogData
Type int logType int
AllowOnConsole bool allowOnConsole bool
LogFile *os.File logFile *os.File
next Logger next Logger
logger *log.Logger
} }
func (l *LoggerImpl) WithFields(logData log.Fields) *LoggerImpl { func (l *LoggerImpl) WithFields(logData log.Fields) *LoggerImpl {

33
elektronLogging/pcpLogger.go
View file

@ -12,25 +12,26 @@ type PCPLogger struct {
LoggerImpl LoggerImpl
} }
func NewPCPLogger(b *baseLogData, logType int, prefix string) *PCPLogger { func NewPCPLogger(b *baseLogData, logType int, prefix string, logger *log.Logger) *PCPLogger {
pLog := &PCPLogger{} pLog := &PCPLogger{}
pLog.Type = logType pLog.logType = logType
pLog.CreateLogFile(prefix) pLog.CreateLogFile(prefix)
pLog.next = nil pLog.next = nil
pLog.baseLogData = b pLog.baseLogData = b
pLog.logger = logger
return pLog return pLog
} }
func (pLog PCPLogger) Log(logType int, level log.Level, message string) { func (pLog PCPLogger) Log(logType int, level log.Level, message string) {
if pLog.Type == logType { if pLog.logType == logType {
if config.PCPConfig.Enabled { if config.PCPConfig.Enabled {
if pLog.AllowOnConsole { if pLog.allowOnConsole {
logger.SetOutput(os.Stdout) pLog.logger.SetOutput(os.Stdout)
logger.WithFields(pLog.data).Log(level, message) pLog.logger.WithFields(pLog.data).Log(level, message)
} }
logger.SetOutput(pLog.LogFile) pLog.logger.SetOutput(pLog.logFile)
logger.WithFields(pLog.data).Log(level, message) pLog.logger.WithFields(pLog.data).Log(level, message)
} }
} }
if pLog.next != nil { if pLog.next != nil {
@ -42,15 +43,15 @@ func (pLog PCPLogger) Log(logType int, level log.Level, message string) {
} }
func (pLog PCPLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { func (pLog PCPLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
if pLog.Type == logType { if pLog.logType == logType {
if config.PCPConfig.Enabled { if config.PCPConfig.Enabled {
if pLog.AllowOnConsole { if pLog.allowOnConsole {
logger.SetOutput(os.Stdout) pLog.logger.SetOutput(os.Stdout)
logger.WithFields(pLog.data).Logf(level, msgFmtString, args...) pLog.logger.WithFields(pLog.data).Logf(level, msgFmtString, args...)
} }
logger.SetOutput(pLog.LogFile) pLog.logger.SetOutput(pLog.logFile)
logger.WithFields(pLog.data).Logf(level, msgFmtString, args...) pLog.logger.WithFields(pLog.data).Logf(level, msgFmtString, args...)
} }
} }
// Forwarding to next logger // Forwarding to next logger
@ -70,8 +71,8 @@ func (pLog *PCPLogger) CreateLogFile(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.LogFile = logFile pLog.logFile = logFile
pLog.AllowOnConsole = config.PCPConfig.AllowOnConsole pLog.allowOnConsole = config.PCPConfig.AllowOnConsole
} }
} }
} }

33
elektronLogging/schedPolicySwitchLogger.go
View file

@ -12,25 +12,26 @@ type SchedPolicySwitchLogger struct {
LoggerImpl LoggerImpl
} }
func NewSchedPolicySwitchLogger(b *baseLogData, logType int, prefix string) *SchedPolicySwitchLogger { func NewSchedPolicySwitchLogger(b *baseLogData, logType int, prefix string, logger *log.Logger) *SchedPolicySwitchLogger {
sLog := &SchedPolicySwitchLogger{} sLog := &SchedPolicySwitchLogger{}
sLog.Type = logType sLog.logType = logType
sLog.CreateLogFile(prefix) sLog.CreateLogFile(prefix)
sLog.next = nil sLog.next = nil
sLog.baseLogData = b sLog.baseLogData = b
sLog.logger = logger
return sLog return sLog
} }
func (sLog SchedPolicySwitchLogger) Log(logType int, level log.Level, message string) { func (sLog SchedPolicySwitchLogger) Log(logType int, level log.Level, message string) {
if sLog.Type == logType { if sLog.logType == logType {
if config.SPSConfig.Enabled { if config.SPSConfig.Enabled {
if sLog.AllowOnConsole { if sLog.allowOnConsole {
logger.SetOutput(os.Stdout) sLog.logger.SetOutput(os.Stdout)
logger.WithFields(sLog.data).Log(level, message) sLog.logger.WithFields(sLog.data).Log(level, message)
} }
logger.SetOutput(sLog.LogFile) sLog.logger.SetOutput(sLog.logFile)
logger.WithFields(sLog.data).Log(level, message) sLog.logger.WithFields(sLog.data).Log(level, message)
} }
} }
if sLog.next != nil { if sLog.next != nil {
@ -42,15 +43,15 @@ func (sLog SchedPolicySwitchLogger) Log(logType int, level log.Level, message st
} }
func (sLog SchedPolicySwitchLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { func (sLog SchedPolicySwitchLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
if sLog.Type == logType { if sLog.logType == logType {
if config.SPSConfig.Enabled { if config.SPSConfig.Enabled {
if sLog.AllowOnConsole { if sLog.allowOnConsole {
logger.SetOutput(os.Stdout) sLog.logger.SetOutput(os.Stdout)
logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
} }
logger.SetOutput(sLog.LogFile) sLog.logger.SetOutput(sLog.logFile)
logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
} }
} }
// Forwarding to next logger // Forwarding to next logger
@ -70,8 +71,8 @@ func (sLog *SchedPolicySwitchLogger) CreateLogFile(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.LogFile = logFile sLog.logFile = logFile
sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole sLog.allowOnConsole = config.SPSConfig.AllowOnConsole
} }
} }
} }

33
elektronLogging/schedTraceLogger.go
View file

@ -12,25 +12,26 @@ type SchedTraceLogger struct {
LoggerImpl LoggerImpl
} }
func NewSchedTraceLogger(b *baseLogData, logType int, prefix string) *SchedTraceLogger { func NewSchedTraceLogger(b *baseLogData, logType int, prefix string, logger *log.Logger) *SchedTraceLogger {
sLog := &SchedTraceLogger{} sLog := &SchedTraceLogger{}
sLog.Type = logType sLog.logType = logType
sLog.CreateLogFile(prefix) sLog.CreateLogFile(prefix)
sLog.next = nil sLog.next = nil
sLog.baseLogData = b sLog.baseLogData = b
sLog.logger = logger
return sLog return sLog
} }
func (sLog SchedTraceLogger) Log(logType int, level log.Level, message string) { func (sLog SchedTraceLogger) Log(logType int, level log.Level, message string) {
if sLog.Type == logType { if sLog.logType == logType {
if config.SchedTraceConfig.Enabled { if config.SchedTraceConfig.Enabled {
if sLog.AllowOnConsole { if sLog.allowOnConsole {
logger.SetOutput(os.Stdout) sLog.logger.SetOutput(os.Stdout)
logger.WithFields(sLog.data).Log(level, message) sLog.logger.WithFields(sLog.data).Log(level, message)
} }
logger.SetOutput(sLog.LogFile) sLog.logger.SetOutput(sLog.logFile)
logger.WithFields(sLog.data).Log(level, message) sLog.logger.WithFields(sLog.data).Log(level, message)
} }
} }
if sLog.next != nil { if sLog.next != nil {
@ -42,15 +43,15 @@ func (sLog SchedTraceLogger) Log(logType int, level log.Level, message string) {
} }
func (sLog SchedTraceLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { func (sLog SchedTraceLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
if sLog.Type == logType { if sLog.logType == logType {
if config.SchedTraceConfig.Enabled { if config.SchedTraceConfig.Enabled {
if sLog.AllowOnConsole { if sLog.allowOnConsole {
logger.SetOutput(os.Stdout) sLog.logger.SetOutput(os.Stdout)
logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
} }
logger.SetOutput(sLog.LogFile) sLog.logger.SetOutput(sLog.logFile)
logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
} }
} }
// Forwarding to next logger // Forwarding to next logger
@ -70,8 +71,8 @@ func (sLog *SchedTraceLogger) CreateLogFile(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.LogFile = logFile sLog.logFile = logFile
sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole sLog.allowOnConsole = config.SchedTraceConfig.AllowOnConsole
} }
} }
} }

33
elektronLogging/schedWindowLogger.go
View file

@ -12,25 +12,26 @@ type SchedWindowLogger struct {
LoggerImpl LoggerImpl
} }
func NewSchedWindowLogger(b *baseLogData, logType int, prefix string) *SchedWindowLogger { func NewSchedWindowLogger(b *baseLogData, logType int, prefix string, logger *log.Logger) *SchedWindowLogger {
sLog := &SchedWindowLogger{} sLog := &SchedWindowLogger{}
sLog.Type = logType sLog.logType = logType
sLog.CreateLogFile(prefix) sLog.CreateLogFile(prefix)
sLog.next = nil sLog.next = nil
sLog.baseLogData = b sLog.baseLogData = b
sLog.logger = logger
return sLog return sLog
} }
func (sLog SchedWindowLogger) Log(logType int, level log.Level, message string) { func (sLog SchedWindowLogger) Log(logType int, level log.Level, message string) {
if sLog.Type == logType { if sLog.logType == logType {
if config.SchedWindowConfig.Enabled { if config.SchedWindowConfig.Enabled {
if sLog.AllowOnConsole { if sLog.allowOnConsole {
logger.SetOutput(os.Stdout) sLog.logger.SetOutput(os.Stdout)
logger.WithFields(sLog.data).Log(level, message) sLog.logger.WithFields(sLog.data).Log(level, message)
} }
logger.SetOutput(sLog.LogFile) sLog.logger.SetOutput(sLog.logFile)
logger.WithFields(sLog.data).Log(level, message) sLog.logger.WithFields(sLog.data).Log(level, message)
} }
} }
// Forwarding to next logger // Forwarding to next logger
@ -43,15 +44,15 @@ func (sLog SchedWindowLogger) Log(logType int, level log.Level, message string)
} }
func (sLog SchedWindowLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) { func (sLog SchedWindowLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
if sLog.Type == logType { if sLog.logType == logType {
if config.SchedWindowConfig.Enabled { if config.SchedWindowConfig.Enabled {
if sLog.AllowOnConsole { if sLog.allowOnConsole {
logger.SetOutput(os.Stdout) sLog.logger.SetOutput(os.Stdout)
logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
} }
logger.SetOutput(sLog.LogFile) sLog.logger.SetOutput(sLog.logFile)
logger.WithFields(sLog.data).Logf(level, msgFmtString, args...) sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
} }
} }
if sLog.next != nil { if sLog.next != nil {
@ -70,8 +71,8 @@ func (sLog *SchedWindowLogger) CreateLogFile(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.LogFile = logFile sLog.logFile = logFile
sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole sLog.allowOnConsole = config.SchedWindowConfig.AllowOnConsole
} }
} }
} }