3543960689
switch to logrus for logging. replaced old logging library with a wrapper around logrus. We now just need to use the exported Log(...) and Logf(...) from the logging/ package that wraps around a set of loggers constituting a chain (following COR). Loggers are configured using a YAML file that specifies the following. 1. enabled/disabled 2. whether the message should be logged on console. 3. filename extension. 4. minimum log level. Retrofitted source code to now use the updated logging library. Updated the documentation with information regarding the specification of the log config file. Currently, the log format in the config file is not adhered to. This is going to be addressed in a future commit.
117 lines
3.1 KiB
Go
117 lines
3.1 KiB
Go
// Copyright (C) 2018 spdfg
|
|
//
|
|
// This file is part of Elektron.
|
|
//
|
|
// Elektron is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
//
|
|
// Elektron is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Elektron. If not, see <http://www.gnu.org/licenses/>.
|
|
//
|
|
|
|
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.isAllowedOnConsole() {
|
|
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.isAllowedOnConsole() {
|
|
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.getFilenameExtension()}, "")
|
|
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
|
|
}
|
|
}
|
|
}
|
|
}
|