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

Changes made everywhere inorder to use elektronLogging library for logging

Browse source
This commit is contained in:
balandi1 2019-11-13 14:08:52 -05:00
parent b501054412
commit c27aba895b
23 changed files with 382 additions and 308 deletions
Download patch file Download diff file Expand all files Collapse all files

6
elektronLogging/ElektronFormatter.go
View file

@ -37,8 +37,10 @@ func (f ElektronFormatter) Format(entry *log.Entry) ([]byte, error) {
levelColor := f.getColor(entry)
level := levelColor.Sprintf("[%s]:",strings.ToUpper(entry.Level.String()))
message := fmt.Sprintf("%s %s %s ",level,entry.Time.Format(f.TimestampFormat), entry.Message)
message := fmt.Sprintf("%s %s ",level,entry.Time.Format(f.TimestampFormat))
if entry.Message != "" {
message = fmt.Sprintf("%s %s %s ",level,entry.Time.Format(f.TimestampFormat), entry.Message)
}
var formattedFields []string
for key, value := range entry.Data {
formattedFields = append(formattedFields,

20
elektronLogging/clsfnTaskDistOverheadLogger.go
View file

@ -1,10 +1,8 @@
package elektronLogging
import (
//"fmt"
"os"
logrus "github.com/sirupsen/logrus"
data "gitlab.com/spdf/elektron/elektronLogging/data"
log "github.com/sirupsen/logrus"
)
type ClsfnTaskDistOverheadLogger struct {
@ -18,20 +16,18 @@ func NewClsfnTaskDistOverheadLogger(logType int, prefix string) *ClsfnTaskDistOv
return cLog
}
func (cLog *ClsfnTaskDistOverheadLogger) Log(logType int, level logrus.Level, logData data.LogData,message string) {
func (cLog *ClsfnTaskDistOverheadLogger) Log(logType int, level log.Level, logData log.Fields,message string) {
if cLog.Type == logType {
logFields := cloneFields(logData)
log.SetLevel(level)
logger.SetLevel(level)
if cLog.AllowOnConsole {
log.SetOutput(os.Stdout)
log.WithFields(logFields).Println(message)
logger.SetOutput(os.Stdout)
logger.WithFields(logData).Println(message)
}
log.SetOutput(cLog.LogFileName)
log.WithFields(logFields).Println(message)
logger.SetOutput(cLog.LogFileName)
logger.WithFields(logData).Println(message)
}
if cLog.next != nil {
cLog.next.Log(logType, level, logData, message)
@ -45,7 +41,7 @@ func (cLog *ClsfnTaskDistOverheadLogger) SetLogFile(prefix string) {
tskDistLogPrefix = logDir + "/" + tskDistLogPrefix
}
if logFile, err := os.Create(tskDistLogPrefix); err != nil {
logrus.Fatal("Unable to create logFile: ", err)
log.Fatal("Unable to create logFile: ", err)
} else {
cLog.LogFileName = logFile
cLog.AllowOnConsole = config.TaskDistConfig.AllowOnConsole

11
elektronLogging/consoleLogger.go
View file

@ -3,7 +3,6 @@ package elektronLogging
import (
"os"
log "github.com/sirupsen/logrus"
//data "github.com/spdfg/elektron/elektronLogging/data"
)
type ConsoleLogger struct {
@ -20,13 +19,13 @@ func (cLog *ConsoleLogger) Log(logType int, level log.Level, logData log.Fields,
if logType <= cLog.Type {
//logFields := cloneFields(logData)
log.SetLevel(level)
logger.SetLevel(level)
log.SetOutput(os.Stdout)
log.WithFields(logData).Println(message)
logger.SetOutput(os.Stdout)
logger.WithFields(logData).Println(message)
log.SetOutput(cLog.LogFileName)
log.WithFields(logData).Println(message)
logger.SetOutput(cLog.LogFileName)
logger.WithFields(logData).Println(message)
}
if cLog.next != nil {
cLog.next.Log(logType, level, logData, message)

11
elektronLogging/logger.go
View file

@ -11,21 +11,25 @@ import (
var config LoggerConfig
var logger *log.Logger
var formatter ElektronFormatter
//var logDir string
func BuildLogger() *LoggerImpl {
// read configuration from yaml
config.GetConfig()
// create the log directory
startTime := time.Now()
formatter.TimestampFormat = "2006-01-02 15:04:05"
GetLogDir(startTime, "_")
prefix := fmt.Sprintf("_%s%s%s%s%s",startTime.Month().String(),strconv.Itoa(startTime.Day()),
prefix := fmt.Sprintf("_%d%d%s%s%s%s",startTime.Year(), startTime.Month(),strconv.Itoa(startTime.Day()),
strconv.Itoa(startTime.Hour()),strconv.Itoa(startTime.Minute()),strconv.Itoa(startTime.Second()))
//create a single logrus instance and set its formatter to ElektronFormatter
logger = log.New()
logger.SetFormatter(&formatter)
// create a chain of loggers
head := new(LoggerImpl)
cLog := NewConsoleLogger(CONSOLE,prefix)
pLog := NewPcpLogger(PCP,prefix)
@ -38,7 +42,6 @@ func BuildLogger() *LoggerImpl {
cLog.SetNext(pLog)
pLog.SetNext(schedTraceLog)
schedTraceLog.SetNext(spsLog)
spsLog.SetNext(schedWindowLog)
schedWindowLog.SetNext(tskDistLog)

2
elektronLogging/loggerConfig.go
View file

@ -3,7 +3,7 @@ import (
"gopkg.in/yaml.v2"
"io/ioutil"
log "github.com/sirupsen/logrus"
elekEnv "gitlab.com/spdf/elektron/environment"
elekEnv "github.com/spdfg/elektron/environment"
)
type LoggerConfig struct {

13
elektronLogging/pcpLogger.go
View file

@ -3,7 +3,6 @@ package elektronLogging
import (
"os"
log "github.com/sirupsen/logrus"
//data "github.com/spdfg/elektron/elektronLogging/data"
)
type PcpLogger struct {
@ -20,17 +19,15 @@ func NewPcpLogger(logType int, prefix string) *PcpLogger {
func (pLog *PcpLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if pLog.Type == logType {
//logFields := cloneFields(logData)
log.SetLevel(level)
logger.SetLevel(level)
if pLog.AllowOnConsole {
log.SetOutput(os.Stdout)
log.WithFields(logData).Println(message)
logger.SetOutput(os.Stdout)
logger.WithFields(logData).Println(message)
}
log.SetOutput(pLog.LogFileName)
log.WithFields(logData).Println(message)
logger.SetOutput(pLog.LogFileName)
logger.WithFields(logData).Println(message)
}
if pLog.next != nil {
pLog.next.Log(logType, level, logData, message)

14
elektronLogging/schedPolicySwitchLogger.go
View file

@ -1,10 +1,8 @@
package elektronLogging
import (
//"fmt"
"os"
log "github.com/sirupsen/logrus"
//data "github.com/spdfg/elektron/elektronLogging/data"
)
type SchedPolicySwitchLogger struct {
@ -21,17 +19,15 @@ func NewSchedPolicySwitchLogger(logType int, prefix string) *SchedPolicySwitchLo
func (sLog *SchedPolicySwitchLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if sLog.Type == logType {
//logFields := cloneFields(logData)
log.SetLevel(level)
logger.SetLevel(level)
if sLog.AllowOnConsole {
log.SetOutput(os.Stdout)
log.WithFields(logData).Println(message)
logger.SetOutput(os.Stdout)
logger.WithFields(logData).Println(message)
}
log.SetOutput(sLog.LogFileName)
log.WithFields(logData).Println(message)
logger.SetOutput(sLog.LogFileName)
logger.WithFields(logData).Println(message)
}
if sLog.next != nil {
sLog.next.Log(logType, level, logData, message)

14
elektronLogging/schedTraceLogger.go
View file

@ -1,10 +1,8 @@
package elektronLogging
import (
//"fmt"
"os"
log "github.com/sirupsen/logrus"
//data "github.com/spdfg/elektron/elektronLogging/data"
)
type SchedTraceLogger struct {
@ -21,17 +19,15 @@ func NewSchedTraceLogger(logType int, prefix string) *SchedTraceLogger {
func (sLog *SchedTraceLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if sLog.Type == logType {
//logFields := cloneFields(logData)
log.SetLevel(level)
logger.SetLevel(level)
if sLog.AllowOnConsole {
log.SetOutput(os.Stdout)
log.WithFields(logData).Println(message)
logger.SetOutput(os.Stdout)
logger.WithFields(logData).Println(message)
}
log.SetOutput(sLog.LogFileName)
log.WithFields(logData).Println(message)
logger.SetOutput(sLog.LogFileName)
logger.WithFields(logData).Println(message)
}
if sLog.next != nil {
sLog.next.Log(logType, level, logData, message)

13
elektronLogging/schedWindowLogger.go
View file

@ -3,7 +3,6 @@ package elektronLogging
import (
"os"
log "github.com/sirupsen/logrus"
//data "github.com/spdfg/elektron/elektronLogging/data"
)
type SchedWindowLogger struct {
@ -20,16 +19,14 @@ func NewSchedWindowLogger(logType int, prefix string) *SchedWindowLogger {
func (sLog *SchedWindowLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if sLog.Type == logType {
//logFields := cloneFields(logData)
log.SetLevel(level)
logger.SetLevel(level)
if sLog.AllowOnConsole {
log.SetOutput(os.Stdout)
log.WithFields(logData).Println(message)
logger.SetOutput(os.Stdout)
logger.WithFields(logData).Println(message)
}
log.SetOutput(sLog.LogFileName)
log.WithFields(logData).Println(message)
logger.SetOutput(sLog.LogFileName)
logger.WithFields(logData).Println(message)
}
if sLog.next != nil {
sLog.next.Log(logType, level, logData, message)

1
elektronLogging/types/types.go
View file

@ -1,6 +1,5 @@
package elektronLogging
import "github.com/fatih/color"
const (
ERROR = iota