6fb0e4a3fe
1. Instead of maintaining a global config, each specialized logger now stores its config. 2. Refactored logInterface to elektronLogger. 3. Refactored loggerImpl to baseElektronLogger to be consistent with the rest of the code base. 4. Wrapped elektronLogger#Log(...) and elektronLogf(...) so that we do not have to use the instance of elektronLogger everytime we want to log. Instead, we just do logging.Log(...) or logging.Logf(...). 5. Wrapped elektronLogger#WithFields(...) and elektronLogger#WithField(...). 6. Refactored codebase to adhere to the changes.
99 lines
2.4 KiB
Go
99 lines
2.4 KiB
Go
package logging
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
log "github.com/sirupsen/logrus"
|
|
)
|
|
|
|
type ClsfnTaskDistrOverheadLogger struct {
|
|
baseElektronLogger
|
|
}
|
|
|
|
func NewClsfnTaskDistrOverheadLogger(
|
|
config *LoggerConfig,
|
|
b *baseLogData,
|
|
logType int,
|
|
prefix string,
|
|
logger *log.Logger,
|
|
logDir *logDirectory) *ClsfnTaskDistrOverheadLogger {
|
|
|
|
cLog := &ClsfnTaskDistrOverheadLogger{
|
|
baseElektronLogger: baseElektronLogger{
|
|
baseLogData: b,
|
|
config: struct {
|
|
Enabled bool
|
|
FilenameExtension string
|
|
AllowOnConsole bool
|
|
}{
|
|
Enabled: config.TaskDistrConfig.Enabled,
|
|
FilenameExtension: config.TaskDistrConfig.FilenameExtension,
|
|
AllowOnConsole: config.TaskDistrConfig.AllowOnConsole,
|
|
},
|
|
logType: logType,
|
|
next: nil,
|
|
logger: logger,
|
|
logDir: logDir,
|
|
},
|
|
}
|
|
|
|
cLog.createLogFile(prefix)
|
|
return cLog
|
|
}
|
|
func (cLog ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, message string) {
|
|
if cLog.logType == logType {
|
|
if cLog.isEnabled() {
|
|
if cLog.config.AllowOnConsole {
|
|
cLog.logger.SetOutput(os.Stdout)
|
|
cLog.logger.WithFields(cLog.data).Log(level, message)
|
|
}
|
|
|
|
cLog.logger.SetOutput(cLog.logFile)
|
|
cLog.logger.WithFields(cLog.data).Log(level, message)
|
|
}
|
|
}
|
|
// 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 cLog.logType == logType {
|
|
if cLog.isEnabled() {
|
|
if cLog.config.AllowOnConsole {
|
|
cLog.logger.SetOutput(os.Stdout)
|
|
cLog.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 {
|
|
cLog.next.Logf(logType, level, msgFmtString, args...)
|
|
} else {
|
|
// Clearing the fields.
|
|
cLog.resetFields()
|
|
}
|
|
}
|
|
|
|
func (cLog *ClsfnTaskDistrOverheadLogger) createLogFile(prefix string) {
|
|
|
|
if cLog.isEnabled() {
|
|
filename := strings.Join([]string{prefix, cLog.config.FilenameExtension}, "")
|
|
dirName := cLog.logDir.getDirName()
|
|
if dirName != "" {
|
|
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
|
|
log.Fatal("Unable to create logFile: ", err)
|
|
} else {
|
|
cLog.logFile = logFile
|
|
}
|
|
}
|
|
}
|
|
}
|