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

29
elektronLogging/consoleLogger.go
View file

@ -12,22 +12,23 @@ type ConsoleLogger struct {
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.Type = logType
cLog.logType = logType
cLog.CreateLogFile(prefix)
cLog.next = nil
cLog.baseLogData = b
cLog.logger = logger
return cLog
}
func (cLog ConsoleLogger) Log(logType int, level log.Level, message string) {
if logType <= cLog.Type {
if logType <= cLog.logType {
if config.ConsoleConfig.Enabled {
logger.SetOutput(os.Stdout)
logger.WithFields(cLog.data).Log(level, message)
cLog.logger.SetOutput(os.Stdout)
cLog.logger.WithFields(cLog.data).Log(level, message)
logger.SetOutput(cLog.LogFile)
logger.WithFields(cLog.data).Log(level, message)
cLog.logger.SetOutput(cLog.logFile)
cLog.logger.WithFields(cLog.data).Log(level, message)
}
}
// 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{}) {
if logType <= cLog.Type {
if logType <= cLog.logType {
if config.ConsoleConfig.Enabled {
logger.SetOutput(os.Stdout)
logger.WithFields(cLog.data).Logf(level, msgFmtString, args...)
cLog.logger.SetOutput(os.Stdout)
cLog.logger.WithFields(cLog.data).Logf(level, msgFmtString, args...)
logger.SetOutput(cLog.LogFile)
logger.WithFields(cLog.data).Logf(level, msgFmtString, args...)
cLog.logger.SetOutput(cLog.logFile)
cLog.logger.WithFields(cLog.data).Logf(level, msgFmtString, args...)
}
}
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 {
log.Fatal("Unable to create logFile: ", err)
} else {
cLog.LogFile = logFile
cLog.AllowOnConsole = config.ConsoleConfig.AllowOnConsole
cLog.logFile = logFile
cLog.allowOnConsole = config.ConsoleConfig.AllowOnConsole
}
}
}