Code Refactoring
Modified comments. Organized imports.
This commit is contained in:
parent
2fa3bebaa6
commit
0c0361e209
24 changed files with 114 additions and 105 deletions
|
@ -3,8 +3,9 @@ package elektronLogging
|
|||
import (
|
||||
"bytes"
|
||||
"github.com/fatih/color"
|
||||
log "github.com/sirupsen/logrus"
|
||||
"strings"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type ElektronFormatter struct {
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
package elektronLogging
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type ClsfnTaskDistrOverheadLogger struct {
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
package elektronLogging
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type ConsoleLogger struct {
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
package elektronLogging
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type logDirectory struct {
|
||||
|
@ -19,8 +20,7 @@ func (logD *logDirectory) getDirName() string {
|
|||
func (logD *logDirectory) createLogDir(prefix string, startTime time.Time) {
|
||||
|
||||
if logD.name == "" {
|
||||
// Creating directory to store all logs for this run
|
||||
// directory name format - 2019-November-21_14-33-0
|
||||
// Creating directory to store all logs for this run. Directory name format - 2019-November-21_14-33-0.
|
||||
logDirName := strings.Join([]string{"./", prefix, strconv.Itoa(startTime.Year())}, "")
|
||||
logDirName = strings.Join([]string{logDirName, startTime.Month().String(), strconv.Itoa(startTime.Day())}, "-")
|
||||
logDirName = strings.Join([]string{logDirName, strconv.Itoa(startTime.Hour())}, "_")
|
||||
|
|
|
@ -1,30 +1,32 @@
|
|||
package elektronLogging
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
. "github.com/spdfg/elektron/elektronLogging/types"
|
||||
"os"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
. "github.com/spdfg/elektron/elektronLogging/types"
|
||||
)
|
||||
|
||||
var config LoggerConfig
|
||||
var logger *log.Logger
|
||||
var formatter ElektronFormatter
|
||||
var ElektronLog *ConsoleLogger
|
||||
var ElektronLogger *ConsoleLogger
|
||||
var logDir logDirectory
|
||||
|
||||
func BuildLogger(prefix string, logConfigFilename string) {
|
||||
|
||||
// read configuration from yaml
|
||||
// Read configuration from yaml.
|
||||
config.GetConfig(logConfigFilename)
|
||||
|
||||
// create the log directory
|
||||
// Create the log directory.
|
||||
startTime := time.Now()
|
||||
formatter.TimestampFormat = "2006-01-02 15:04:05"
|
||||
formattedStartTime := startTime.Format("20060102150405")
|
||||
|
||||
logDir.createLogDir(prefix, startTime)
|
||||
|
||||
// Instantiate the logrus instance.
|
||||
prefix = strings.Join([]string{prefix, formattedStartTime}, "_")
|
||||
logger = &log.Logger{
|
||||
Out: os.Stderr,
|
||||
|
@ -32,8 +34,7 @@ func BuildLogger(prefix string, logConfigFilename string) {
|
|||
Formatter: &formatter,
|
||||
}
|
||||
|
||||
// create a chain of loggers
|
||||
//head := &LoggerImpl{}
|
||||
// Create a chain of loggers.
|
||||
cLog := NewConsoleLogger(CONSOLE, prefix)
|
||||
pLog := NewPCPLogger(PCP, prefix)
|
||||
schedTraceLog := NewSchedTraceLogger(SCHED_TRACE, prefix)
|
||||
|
@ -41,12 +42,11 @@ func BuildLogger(prefix string, logConfigFilename string) {
|
|||
schedWindowLog := NewSchedWindowLogger(SCHED_WINDOW, prefix)
|
||||
tskDistLog := NewClsfnTaskDistrOverheadLogger(CLSFN_TASKDIST_OVERHEAD, prefix)
|
||||
|
||||
//head.SetNext(cLog)
|
||||
cLog.SetNext(pLog)
|
||||
pLog.SetNext(schedTraceLog)
|
||||
schedTraceLog.SetNext(spsLog)
|
||||
spsLog.SetNext(schedWindowLog)
|
||||
schedWindowLog.SetNext(tskDistLog)
|
||||
|
||||
ElektronLog = cLog
|
||||
ElektronLogger = cLog
|
||||
}
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
package elektronLogging
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type PCPLogger struct {
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
package elektronLogging
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type SchedPolicySwitchLogger struct {
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
package elektronLogging
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type SchedTraceLogger struct {
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
package elektronLogging
|
||||
|
||||
import (
|
||||
log "github.com/sirupsen/logrus"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
|
||||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type SchedWindowLogger struct {
|
||||
|
|
Reference in a new issue