WIP : Elektron Logging library #16
|
@ -45,7 +45,7 @@ func newClsfnTaskDistrOverheadLogger(
|
||||||
func (cLog clsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, message string) {
|
func (cLog clsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, message string) {
|
||||||
if cLog.logType == logType {
|
if cLog.logType == logType {
|
||||||
if cLog.isEnabled() {
|
if cLog.isEnabled() {
|
||||||
if cLog.config.AllowOnConsole {
|
if cLog.isAllowedOnConsole() {
|
||||||
cLog.logger.SetOutput(os.Stdout)
|
cLog.logger.SetOutput(os.Stdout)
|
||||||
cLog.logger.WithFields(cLog.data).Log(level, message)
|
cLog.logger.WithFields(cLog.data).Log(level, message)
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,7 @@ func (cLog clsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, messa
|
||||||
func (cLog clsfnTaskDistrOverheadLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
|
func (cLog clsfnTaskDistrOverheadLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
|
||||||
if cLog.logType == logType {
|
if cLog.logType == logType {
|
||||||
if cLog.isEnabled() {
|
if cLog.isEnabled() {
|
||||||
if cLog.config.AllowOnConsole {
|
if cLog.isAllowedOnConsole() {
|
||||||
cLog.logger.SetOutput(os.Stdout)
|
cLog.logger.SetOutput(os.Stdout)
|
||||||
cLog.logger.WithFields(cLog.data).Logf(level, msgFmtString, args...)
|
cLog.logger.WithFields(cLog.data).Logf(level, msgFmtString, args...)
|
||||||
}
|
}
|
||||||
|
@ -86,7 +86,7 @@ func (cLog clsfnTaskDistrOverheadLogger) Logf(logType int, level log.Level, msgF
|
||||||
func (cLog *clsfnTaskDistrOverheadLogger) createLogFile(prefix string) {
|
func (cLog *clsfnTaskDistrOverheadLogger) createLogFile(prefix string) {
|
||||||
|
|
||||||
if cLog.isEnabled() {
|
if cLog.isEnabled() {
|
||||||
filename := strings.Join([]string{prefix, cLog.config.FilenameExtension}, "")
|
filename := strings.Join([]string{prefix, cLog.getFilenameExtension()}, "")
|
||||||
dirName := cLog.logDir.getDirName()
|
dirName := cLog.logDir.getDirName()
|
||||||
if dirName != "" {
|
if dirName != "" {
|
||||||
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
|
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
|
||||||
|
|
|
@ -86,7 +86,7 @@ func (cLog consoleLogger) Logf(logType int, level log.Level, msgFmtString string
|
||||||
func (cLog *consoleLogger) createLogFile(prefix string) {
|
func (cLog *consoleLogger) createLogFile(prefix string) {
|
||||||
// Create log file for the type if it is enabled.
|
// Create log file for the type if it is enabled.
|
||||||
if cLog.isEnabled() {
|
if cLog.isEnabled() {
|
||||||
filename := strings.Join([]string{prefix, cLog.config.FilenameExtension}, "")
|
filename := strings.Join([]string{prefix, cLog.getFilenameExtension()}, "")
|
||||||
dirName := cLog.logDir.getDirName()
|
dirName := cLog.logDir.getDirName()
|
||||||
fmt.Println(dirName)
|
fmt.Println(dirName)
|
||||||
if dirName != "" {
|
if dirName != "" {
|
||||||
|
|
|
@ -17,6 +17,8 @@ var elektronLoggerInstance elektronLogger
|
||||||
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
|
|||||||
type elektronLogger interface {
|
type elektronLogger interface {
|
||||||
setNext(next elektronLogger)
|
setNext(next elektronLogger)
|
||||||
isEnabled() bool
|
isEnabled() bool
|
||||||
|
isAllowedOnConsole() bool
|
||||||
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
|
|||||||
|
getFilenameExtension() string
|
||||||
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
|
|||||||
Log(logType int, level log.Level, message string)
|
Log(logType int, level log.Level, message string)
|
||||||
Logf(logType int, level log.Level, msgFmtString string, args ...interface{})
|
Logf(logType int, level log.Level, msgFmtString string, args ...interface{})
|
||||||
WithFields(logData log.Fields) elektronLogger
|
WithFields(logData log.Fields) elektronLogger
|
||||||
|
@ -47,6 +49,14 @@ func (l baseElektronLogger) isEnabled() bool {
|
||||||
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
|
|||||||
return l.config.Enabled
|
return l.config.Enabled
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (l baseElektronLogger) isAllowedOnConsole() bool {
|
||||||
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
|
|||||||
|
return l.config.AllowOnConsole
|
||||||
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
|
|||||||
|
}
|
||||||
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
|
|||||||
|
|
||||||
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
|
|||||||
|
func (l baseElektronLogger) getFilenameExtension() string {
|
||||||
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
|
|||||||
|
return l.config.FilenameExtension
|
||||||
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
|
|||||||
|
}
|
||||||
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
|
|||||||
|
|
||||||
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
|
|||||||
func (l *baseElektronLogger) WithFields(logData log.Fields) elektronLogger {
|
func (l *baseElektronLogger) WithFields(logData log.Fields) elektronLogger {
|
||||||
l.data = logData
|
l.data = logData
|
||||||
return l
|
return l
|
||||||
|
|
||||||
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
![]()
`isEnabled()` does not have to be part of the interface.
![]() ditto ditto
![]() ditto ditto
![]() Yes. Removed it from there Yes. Removed it from there
![]() Done Done
![]() Done Done
|
|
@ -46,7 +46,7 @@ func newPCPLogger(
|
||||||
func (pLog pcpLogger) Log(logType int, level log.Level, message string) {
|
func (pLog pcpLogger) Log(logType int, level log.Level, message string) {
|
||||||
if pLog.logType == logType {
|
if pLog.logType == logType {
|
||||||
if pLog.isEnabled() {
|
if pLog.isEnabled() {
|
||||||
if pLog.config.AllowOnConsole {
|
if pLog.isAllowedOnConsole() {
|
||||||
pLog.logger.SetOutput(os.Stdout)
|
pLog.logger.SetOutput(os.Stdout)
|
||||||
pLog.logger.WithFields(pLog.data).Log(level, message)
|
pLog.logger.WithFields(pLog.data).Log(level, message)
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,7 @@ func (pLog pcpLogger) Log(logType int, level log.Level, message string) {
|
||||||
func (pLog pcpLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
|
func (pLog pcpLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
|
||||||
if pLog.logType == logType {
|
if pLog.logType == logType {
|
||||||
if pLog.isEnabled() {
|
if pLog.isEnabled() {
|
||||||
if pLog.config.AllowOnConsole {
|
if pLog.isAllowedOnConsole() {
|
||||||
pLog.logger.SetOutput(os.Stdout)
|
pLog.logger.SetOutput(os.Stdout)
|
||||||
pLog.logger.WithFields(pLog.data).Logf(level, msgFmtString, args...)
|
pLog.logger.WithFields(pLog.data).Logf(level, msgFmtString, args...)
|
||||||
}
|
}
|
||||||
|
@ -86,7 +86,7 @@ func (pLog pcpLogger) Logf(logType int, level log.Level, msgFmtString string, ar
|
||||||
|
|
||||||
func (pLog *pcpLogger) createLogFile(prefix string) {
|
func (pLog *pcpLogger) createLogFile(prefix string) {
|
||||||
if pLog.isEnabled() {
|
if pLog.isEnabled() {
|
||||||
filename := strings.Join([]string{prefix, pLog.config.FilenameExtension}, "")
|
filename := strings.Join([]string{prefix, pLog.getFilenameExtension()}, "")
|
||||||
dirName := pLog.logDir.getDirName()
|
dirName := pLog.logDir.getDirName()
|
||||||
if dirName != "" {
|
if dirName != "" {
|
||||||
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
|
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
|
||||||
|
|
|
@ -46,7 +46,7 @@ func newSchedPolicySwitchLogger(
|
||||||
func (sLog schedPolicySwitchLogger) Log(logType int, level log.Level, message string) {
|
func (sLog schedPolicySwitchLogger) Log(logType int, level log.Level, message string) {
|
||||||
if sLog.logType == logType {
|
if sLog.logType == logType {
|
||||||
if sLog.isEnabled() {
|
if sLog.isEnabled() {
|
||||||
if sLog.config.AllowOnConsole {
|
if sLog.isAllowedOnConsole() {
|
||||||
sLog.logger.SetOutput(os.Stdout)
|
sLog.logger.SetOutput(os.Stdout)
|
||||||
sLog.logger.WithFields(sLog.data).Log(level, message)
|
sLog.logger.WithFields(sLog.data).Log(level, message)
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,7 @@ func (sLog schedPolicySwitchLogger) Log(logType int, level log.Level, message st
|
||||||
func (sLog schedPolicySwitchLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
|
func (sLog schedPolicySwitchLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
|
||||||
if sLog.logType == logType {
|
if sLog.logType == logType {
|
||||||
if sLog.isEnabled() {
|
if sLog.isEnabled() {
|
||||||
if sLog.config.AllowOnConsole {
|
if sLog.isAllowedOnConsole() {
|
||||||
sLog.logger.SetOutput(os.Stdout)
|
sLog.logger.SetOutput(os.Stdout)
|
||||||
sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
|
sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
|
||||||
}
|
}
|
||||||
|
@ -86,7 +86,7 @@ func (sLog schedPolicySwitchLogger) Logf(logType int, level log.Level, msgFmtStr
|
||||||
|
|
||||||
func (sLog *schedPolicySwitchLogger) createLogFile(prefix string) {
|
func (sLog *schedPolicySwitchLogger) createLogFile(prefix string) {
|
||||||
if sLog.isEnabled() {
|
if sLog.isEnabled() {
|
||||||
filename := strings.Join([]string{prefix, sLog.config.FilenameExtension}, "")
|
filename := strings.Join([]string{prefix, sLog.getFilenameExtension()}, "")
|
||||||
dirName := sLog.logDir.getDirName()
|
dirName := sLog.logDir.getDirName()
|
||||||
if dirName != "" {
|
if dirName != "" {
|
||||||
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
|
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
|
||||||
|
|
|
@ -46,7 +46,7 @@ func newSchedTraceLogger(
|
||||||
func (sLog schedTraceLogger) Log(logType int, level log.Level, message string) {
|
func (sLog schedTraceLogger) Log(logType int, level log.Level, message string) {
|
||||||
if sLog.logType == logType {
|
if sLog.logType == logType {
|
||||||
if sLog.isEnabled() {
|
if sLog.isEnabled() {
|
||||||
if sLog.config.AllowOnConsole {
|
if sLog.isAllowedOnConsole() {
|
||||||
sLog.logger.SetOutput(os.Stdout)
|
sLog.logger.SetOutput(os.Stdout)
|
||||||
sLog.logger.WithFields(sLog.data).Log(level, message)
|
sLog.logger.WithFields(sLog.data).Log(level, message)
|
||||||
}
|
}
|
||||||
|
@ -66,7 +66,7 @@ func (sLog schedTraceLogger) Log(logType int, level log.Level, message string) {
|
||||||
func (sLog schedTraceLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
|
func (sLog schedTraceLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
|
||||||
if sLog.logType == logType {
|
if sLog.logType == logType {
|
||||||
if sLog.isEnabled() {
|
if sLog.isEnabled() {
|
||||||
if sLog.config.AllowOnConsole {
|
if sLog.isAllowedOnConsole() {
|
||||||
sLog.logger.SetOutput(os.Stdout)
|
sLog.logger.SetOutput(os.Stdout)
|
||||||
sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
|
sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
|
||||||
}
|
}
|
||||||
|
@ -86,7 +86,7 @@ func (sLog schedTraceLogger) Logf(logType int, level log.Level, msgFmtString str
|
||||||
|
|
||||||
func (sLog *schedTraceLogger) createLogFile(prefix string) {
|
func (sLog *schedTraceLogger) createLogFile(prefix string) {
|
||||||
if sLog.isEnabled() {
|
if sLog.isEnabled() {
|
||||||
filename := strings.Join([]string{prefix, sLog.config.FilenameExtension}, "")
|
filename := strings.Join([]string{prefix, sLog.getFilenameExtension()}, "")
|
||||||
dirName := sLog.logDir.getDirName()
|
dirName := sLog.logDir.getDirName()
|
||||||
if dirName != "" {
|
if dirName != "" {
|
||||||
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
|
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
|
||||||
|
|
|
@ -46,7 +46,7 @@ func newSchedWindowLogger(
|
||||||
func (sLog schedWindowLogger) Log(logType int, level log.Level, message string) {
|
func (sLog schedWindowLogger) Log(logType int, level log.Level, message string) {
|
||||||
if sLog.logType == logType {
|
if sLog.logType == logType {
|
||||||
if sLog.isEnabled() {
|
if sLog.isEnabled() {
|
||||||
if sLog.config.AllowOnConsole {
|
if sLog.isAllowedOnConsole() {
|
||||||
sLog.logger.SetOutput(os.Stdout)
|
sLog.logger.SetOutput(os.Stdout)
|
||||||
sLog.logger.WithFields(sLog.data).Log(level, message)
|
sLog.logger.WithFields(sLog.data).Log(level, message)
|
||||||
}
|
}
|
||||||
|
@ -67,7 +67,7 @@ func (sLog schedWindowLogger) Log(logType int, level log.Level, message string)
|
||||||
func (sLog schedWindowLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
|
func (sLog schedWindowLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
|
||||||
if sLog.logType == logType {
|
if sLog.logType == logType {
|
||||||
if sLog.isEnabled() {
|
if sLog.isEnabled() {
|
||||||
if sLog.config.AllowOnConsole {
|
if sLog.isAllowedOnConsole() {
|
||||||
sLog.logger.SetOutput(os.Stdout)
|
sLog.logger.SetOutput(os.Stdout)
|
||||||
sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
|
sLog.logger.WithFields(sLog.data).Logf(level, msgFmtString, args...)
|
||||||
}
|
}
|
||||||
|
@ -86,7 +86,7 @@ func (sLog schedWindowLogger) Logf(logType int, level log.Level, msgFmtString st
|
||||||
|
|
||||||
func (sLog *schedWindowLogger) createLogFile(prefix string) {
|
func (sLog *schedWindowLogger) createLogFile(prefix string) {
|
||||||
if sLog.isEnabled() {
|
if sLog.isEnabled() {
|
||||||
filename := strings.Join([]string{prefix, sLog.config.FilenameExtension}, "")
|
filename := strings.Join([]string{prefix, sLog.getFilenameExtension()}, "")
|
||||||
dirName := sLog.logDir.getDirName()
|
dirName := sLog.logDir.getDirName()
|
||||||
if dirName != "" {
|
if dirName != "" {
|
||||||
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
|
if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil {
|
||||||
|
|
isEnabled()
does not have to be part of the interface.