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

Revert previous commit. Renamed wrong alias

Browse source
This commit is contained in:
balandi1 2019-11-21 14:12:53 -05:00
parent 9952b9861d
commit 270c8669e6
24 changed files with 229 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

14
elektronLogging/ElektronFormatter.go
View file

@ -3,7 +3,7 @@ package elektronLogging
import (
"bytes"
"github.com/fatih/color"
elekLog "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"strings"
)
@ -11,21 +11,21 @@ type ElektronFormatter struct {
TimestampFormat string
}
func (f ElektronFormatter) getColor(entry *elekLog.Entry) *color.Color {
func (f ElektronFormatter) getColor(entry *log.Entry) *color.Color {
switch entry.Level {
case elekLog.InfoLevel:
case log.InfoLevel:
return color.New(color.FgGreen, color.Bold)
case elekLog.WarnLevel:
case log.WarnLevel:
return color.New(color.FgYellow, color.Bold)
case elekLog.ErrorLevel:
case log.ErrorLevel:
return color.New(color.FgRed, color.Bold)
case elekLog.FatalLevel:
case log.FatalLevel:
return color.New(color.FgRed, color.Bold)
default:
return color.New(color.FgWhite, color.Bold)
}
}
func (f ElektronFormatter) Format(entry *elekLog.Entry) ([]byte, error) {
func (f ElektronFormatter) Format(entry *log.Entry) ([]byte, error) {
var b *bytes.Buffer
if entry.Buffer != nil {

6
elektronLogging/clsfnTaskDistOverheadLogger.go
View file

@ -1,7 +1,7 @@
package elektronLogging
import (
elekLog "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"os"
"strings"
)
@ -17,7 +17,7 @@ func NewClsfnTaskDistOverheadLogger(logType int, prefix string) *ClsfnTaskDistOv
return cLog
}
func (cLog *ClsfnTaskDistOverheadLogger) Log(logType int, level elekLog.Level, logData elekLog.Fields, message string) {
func (cLog *ClsfnTaskDistOverheadLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if cLog.Type == logType {
logger.SetLevel(level)
@ -43,7 +43,7 @@ func (cLog *ClsfnTaskDistOverheadLogger) SetLogFile(prefix string) {
tskDistLogPrefix = strings.Join([]string{dirName, tskDistLogPrefix}, "/")
}
if logFile, err := os.Create(tskDistLogPrefix); err != nil {
elekLog.Fatal("Unable to create logFile: ", err)
log.Fatal("Unable to create logFile: ", err)
} else {
cLog.LogFileName = logFile
cLog.AllowOnConsole = config.TaskDistConfig.AllowOnConsole

6
elektronLogging/consoleLogger.go
View file

@ -1,7 +1,7 @@
package elektronLogging
import (
elekLog "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"os"
"strings"
)
@ -16,7 +16,7 @@ func NewConsoleLogger(logType int, prefix string) *ConsoleLogger {
cLog.SetLogFile(prefix)
return cLog
}
func (cLog *ConsoleLogger) Log(logType int, level elekLog.Level, logData elekLog.Fields, message string) {
func (cLog *ConsoleLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if logType <= cLog.Type {
logger.SetLevel(level)
@ -40,7 +40,7 @@ func (cLog *ConsoleLogger) SetLogFile(prefix string) {
consoleLogPrefix = strings.Join([]string{dirName, consoleLogPrefix}, "/")
}
if logFile, err := os.Create(consoleLogPrefix); err != nil {
elekLog.Fatal("Unable to create logFile: ", err)
log.Fatal("Unable to create logFile: ", err)
} else {
cLog.LogFileName = logFile
cLog.AllowOnConsole = true

4
elektronLogging/createLogDir.go
View file

@ -1,7 +1,7 @@
package elektronLogging
import (
elekLog "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"os"
"strconv"
"strings"
@ -28,7 +28,7 @@ func (logD *logDirectory) createLogDir(prefix string, startTime time.Time) {
if _, err := os.Stat(logDirName); os.IsNotExist(err) {
os.Mkdir(logDirName, 0755)
} else {
elekLog.Println("Unable to create elekLog directory: ", err)
log.Println("Unable to create log directory: ", err)
logDirName = ""
}

10
elektronLogging/logger.go
View file

@ -1,7 +1,7 @@
package elektronLogging
import (
elekLog "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
. "github.com/spdfg/elektron/elektronLogging/types"
"os"
"strings"
@ -9,7 +9,7 @@ import (
)
var config LoggerConfig
var logger *elekLog.Logger
var logger *log.Logger
var formatter ElektronFormatter
var ElektronLog *LoggerImpl
var logDir logDirectory
@ -19,16 +19,16 @@ func BuildLogger(prefix string) {
// read configuration from yaml
config.GetConfig()
// create the elekLog directory
// create the log directory
startTime := time.Now()
formatter.TimestampFormat = "2006-01-02 15:04:05"
formattedStartTime := startTime.Format("20060102150405")
logDir.createLogDir(prefix, startTime)
prefix = strings.Join([]string{prefix, formattedStartTime}, "_")
logger = &elekLog.Logger{
logger = &log.Logger{
Out: os.Stderr,
Level: elekLog.DebugLevel,
Level: log.DebugLevel,
Formatter: &formatter,
}

6
elektronLogging/loggerChain.go
View file

@ -1,13 +1,13 @@
package elektronLogging
import (
elekLog "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"os"
)
type Logger interface {
SetNext(logType Logger)
Log(logType int, level elekLog.Level, logData elekLog.Fields, message string)
Log(logType int, level log.Level, logData log.Fields, message string)
SetLogFile(prefix string)
}
type LoggerImpl struct {
@ -21,7 +21,7 @@ func (l *LoggerImpl) SetNext(logType Logger) {
l.next = logType
}
func (l *LoggerImpl) Log(logType int, level elekLog.Level, logData elekLog.Fields, message string) {
func (l *LoggerImpl) Log(logType int, level log.Level, logData log.Fields, message string) {
if l.next != nil {
l.next.Log(logType, level, logData, message)
}

6
elektronLogging/loggerConfig.go
View file

@ -1,7 +1,7 @@
package elektronLogging
import (
elekLog "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
elekEnv "github.com/spdfg/elektron/environment"
"gopkg.in/yaml.v2"
"io/ioutil"
@ -57,11 +57,11 @@ func (c *LoggerConfig) GetConfig() *LoggerConfig {
yamlFile, err := ioutil.ReadFile(elekEnv.LogConfigYaml)
if err != nil {
elekLog.Printf("yamlFile.Get err #%v ", err)
log.Printf("yamlFile.Get err #%v ", err)
}
err = yaml.Unmarshal(yamlFile, c)
if err != nil {
elekLog.Fatalf("Unmarshal: %v", err)
log.Fatalf("Unmarshal: %v", err)
}
return c

6
elektronLogging/pcpLogger.go
View file

@ -1,7 +1,7 @@
package elektronLogging
import (
elekLog "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"os"
"strings"
)
@ -17,7 +17,7 @@ func NewPcpLogger(logType int, prefix string) *PcpLogger {
return pLog
}
func (pLog *PcpLogger) Log(logType int, level elekLog.Level, logData elekLog.Fields, message string) {
func (pLog *PcpLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if pLog.Type == logType {
logger.SetLevel(level)
@ -43,7 +43,7 @@ func (plog *PcpLogger) SetLogFile(prefix string) {
pcpLogPrefix = strings.Join([]string{dirName, pcpLogPrefix}, "/")
}
if logFile, err := os.Create(pcpLogPrefix); err != nil {
elekLog.Fatal("Unable to create logFile: ", err)
log.Fatal("Unable to create logFile: ", err)
} else {
plog.LogFileName = logFile
plog.AllowOnConsole = config.PCPConfig.AllowOnConsole

6
elektronLogging/schedPolicySwitchLogger.go
View file

@ -1,7 +1,7 @@
package elektronLogging
import (
elekLog "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"os"
"strings"
)
@ -17,7 +17,7 @@ func NewSchedPolicySwitchLogger(logType int, prefix string) *SchedPolicySwitchLo
return sLog
}
func (sLog *SchedPolicySwitchLogger) Log(logType int, level elekLog.Level, logData elekLog.Fields, message string) {
func (sLog *SchedPolicySwitchLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if sLog.Type == logType {
logger.SetLevel(level)
@ -43,7 +43,7 @@ func (sLog *SchedPolicySwitchLogger) SetLogFile(prefix string) {
spsLogPrefix = strings.Join([]string{dirName, spsLogPrefix}, "/")
}
if logFile, err := os.Create(spsLogPrefix); err != nil {
elekLog.Fatal("Unable to create logFile: ", err)
log.Fatal("Unable to create logFile: ", err)
} else {
sLog.LogFileName = logFile
sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole

6
elektronLogging/schedTraceLogger.go
View file

@ -1,7 +1,7 @@
package elektronLogging
import (
elekLog "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"os"
"strings"
)
@ -17,7 +17,7 @@ func NewSchedTraceLogger(logType int, prefix string) *SchedTraceLogger {
return sLog
}
func (sLog *SchedTraceLogger) Log(logType int, level elekLog.Level, logData elekLog.Fields, message string) {
func (sLog *SchedTraceLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if sLog.Type == logType {
logger.SetLevel(level)
@ -43,7 +43,7 @@ func (sLog *SchedTraceLogger) SetLogFile(prefix string) {
schedTraceLogPrefix = strings.Join([]string{dirName, schedTraceLogPrefix}, "/")
}
if logFile, err := os.Create(schedTraceLogPrefix); err != nil {
elekLog.Fatal("Unable to create logFile: ", err)
log.Fatal("Unable to create logFile: ", err)
} else {
sLog.LogFileName = logFile
sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole

6
elektronLogging/schedWindowLogger.go
View file

@ -1,7 +1,7 @@
package elektronLogging
import (
elekLog "github.com/sirupsen/logrus"
log "github.com/sirupsen/logrus"
"os"
"strings"
)
@ -17,7 +17,7 @@ func NewSchedWindowLogger(logType int, prefix string) *SchedWindowLogger {
return sLog
}
func (sLog *SchedWindowLogger) Log(logType int, level elekLog.Level, logData elekLog.Fields, message string) {
func (sLog *SchedWindowLogger) Log(logType int, level log.Level, logData log.Fields, message string) {
if sLog.Type == logType {
logger.SetLevel(level)
@ -43,7 +43,7 @@ func (sLog *SchedWindowLogger) SetLogFile(prefix string) {
schedWindowLogPrefix = strings.Join([]string{dirName, schedWindowLogPrefix}, "/")
}
if logFile, err := os.Create(schedWindowLogPrefix); err != nil {
elekLog.Fatal("Unable to create logFile: ", err)
log.Fatal("Unable to create logFile: ", err)
} else {
sLog.LogFileName = logFile
sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole