diff --git a/elektronLogging/clsfnTaskDistOverheadLogger.go b/elektronLogging/clsfnTaskDistOverheadLogger.go index 7bd62a1..d674233 100644 --- a/elektronLogging/clsfnTaskDistOverheadLogger.go +++ b/elektronLogging/clsfnTaskDistOverheadLogger.go @@ -18,7 +18,7 @@ func NewClsfnTaskDistrOverheadLogger(logType int, prefix string) *ClsfnTaskDistr return cLog } -func (cLog *ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, logData log.Fields, message string) { +func (cLog ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, logData log.Fields, message string) { if cLog.Type == logType { logger.SetLevel(level) @@ -38,15 +38,14 @@ func (cLog *ClsfnTaskDistrOverheadLogger) Log(logType int, level log.Level, logD func (cLog *ClsfnTaskDistrOverheadLogger) SetLogFile(prefix string) { - tskDistLogPrefix := strings.Join([]string{prefix, config.TaskDistConfig.FilenameExtension}, "") + filename := strings.Join([]string{prefix, config.TaskDistrConfig.FilenameExtension}, "") dirName := logDir.getDirName() if dirName != "" { - tskDistLogPrefix = filepath.Join(dirName, tskDistLogPrefix) - } - if logFile, err := os.Create(tskDistLogPrefix); err != nil { - log.Fatal("Unable to create logFile: ", err) - } else { - cLog.LogFileName = logFile - cLog.AllowOnConsole = config.TaskDistConfig.AllowOnConsole + if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { + log.Fatal("Unable to create logFile: ", err) + } else { + cLog.LogFileName = logFile + cLog.AllowOnConsole = config.TaskDistrConfig.AllowOnConsole + } } } diff --git a/elektronLogging/consoleLogger.go b/elektronLogging/consoleLogger.go index 00e30e7..a213003 100644 --- a/elektronLogging/consoleLogger.go +++ b/elektronLogging/consoleLogger.go @@ -17,7 +17,7 @@ func NewConsoleLogger(logType int, prefix string) *ConsoleLogger { cLog.SetLogFile(prefix) return cLog } -func (cLog *ConsoleLogger) Log(logType int, level log.Level, logData log.Fields, message string) { +func (cLog ConsoleLogger) Log(logType int, level log.Level, logData log.Fields, message string) { if logType <= cLog.Type { logger.SetLevel(level) @@ -35,15 +35,14 @@ func (cLog *ConsoleLogger) Log(logType int, level log.Level, logData log.Fields, func (cLog *ConsoleLogger) SetLogFile(prefix string) { - consoleLogPrefix := strings.Join([]string{prefix, config.ConsoleConfig.FilenameExtension}, "") + filename := strings.Join([]string{prefix, config.ConsoleConfig.FilenameExtension}, "") dirName := logDir.getDirName() if dirName != "" { - consoleLogPrefix = filepath.Join(dirName, consoleLogPrefix) - } - if logFile, err := os.Create(consoleLogPrefix); err != nil { - log.Fatal("Unable to create logFile: ", err) - } else { - cLog.LogFileName = logFile - cLog.AllowOnConsole = true + if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { + log.Fatal("Unable to create logFile: ", err) + } else { + cLog.LogFileName = logFile + cLog.AllowOnConsole = config.ConsoleConfig.AllowOnConsole + } } } diff --git a/elektronLogging/createLogDir.go b/elektronLogging/createLogDir.go index 8b9a148..8d82024 100644 --- a/elektronLogging/createLogDir.go +++ b/elektronLogging/createLogDir.go @@ -20,6 +20,7 @@ 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 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())}, "_") diff --git a/elektronLogging/loggerConfig.go b/elektronLogging/loggerConfig.go index 790669e..a4f57ec 100644 --- a/elektronLogging/loggerConfig.go +++ b/elektronLogging/loggerConfig.go @@ -9,45 +9,40 @@ import ( type LoggerConfig struct { SchedTraceConfig struct { - Enabled bool `yaml:"enabled"` - FilenameExtension string `yaml:"filenameExtension"` - EnableColumnHeaders bool `yaml:"enableColumnHeaders"` - AllowOnConsole bool `yaml:"allowOnConsole"` + Enabled bool `yaml:"enabled"` + FilenameExtension string `yaml:"filenameExtension"` + AllowOnConsole bool `yaml:"allowOnConsole"` } `yaml:"schedTrace"` PCPConfig struct { - Enabled bool `yaml:"enabled"` - FilenameExtension string `yaml:"filenameExtension"` - EnableColumnHeaders bool `yaml:"enableColumnHeaders"` - AllowOnConsole bool `yaml:"allowOnConsole"` + Enabled bool `yaml:"enabled"` + FilenameExtension string `yaml:"filenameExtension"` + AllowOnConsole bool `yaml:"allowOnConsole"` } `yaml:"pcp"` ConsoleConfig struct { - Enabled bool `yaml:"enabled"` - FilenameExtension string `yaml:"filenameExtension"` - EnableColumnHeaders bool `yaml:"enableColumnHeaders"` - MinLogLevel string `yaml:"minLogLevel"` + Enabled bool `yaml:"enabled"` + FilenameExtension string `yaml:"filenameExtension"` + MinLogLevel string `yaml:"minLogLevel"` + AllowOnConsole bool `yaml:"allowOnConsole"` } `yaml:"console"` SPSConfig struct { - Enabled bool `yaml:"enabled"` - FilenameExtension string `yaml:"filenameExtension"` - EnableColumnHeaders bool `yaml:"enableColumnHeaders"` - AllowOnConsole bool `yaml:"allowOnConsole"` + Enabled bool `yaml:"enabled"` + FilenameExtension string `yaml:"filenameExtension"` + AllowOnConsole bool `yaml:"allowOnConsole"` } `yaml:"sps"` - TaskDistConfig struct { - Enabled bool `yaml:"enabled"` - FilenameExtension string `yaml:"filenameExtension"` - EnableColumnHeaders bool `yaml:"enableColumnHeaders"` - AllowOnConsole bool `yaml:"allowOnConsole"` - } `yaml:"clsfnTaskDistOverhead"` + TaskDistrConfig struct { + Enabled bool `yaml:"enabled"` + FilenameExtension string `yaml:"filenameExtension"` + AllowOnConsole bool `yaml:"allowOnConsole"` + } `yaml:"clsfnTaskDistrOverhead"` SchedWindowConfig struct { - Enabled bool `yaml:"enabled"` - FilenameExtension string `yaml:"filenameExtension"` - EnableColumnHeaders bool `yaml:"enableColumnHeaders"` - AllowOnConsole bool `yaml:"allowOnConsole"` + Enabled bool `yaml:"enabled"` + FilenameExtension string `yaml:"filenameExtension"` + AllowOnConsole bool `yaml:"allowOnConsole"` } `yaml:"schedWindow"` Format []string `yaml:"format"` @@ -57,11 +52,11 @@ func (c *LoggerConfig) GetConfig() *LoggerConfig { yamlFile, err := ioutil.ReadFile(elekEnv.LogConfigYaml) if err != nil { - log.Printf("yamlFile.Get err #%v ", err) + log.Printf("Error in reading yaml file #%v ", err) } err = yaml.Unmarshal(yamlFile, c) if err != nil { - log.Fatalf("Unmarshal: %v", err) + log.Fatalf("Error in yaml unmarshal: %v", err) } return c diff --git a/elektronLogging/pcpLogger.go b/elektronLogging/pcpLogger.go index e31369a..c6e7692 100644 --- a/elektronLogging/pcpLogger.go +++ b/elektronLogging/pcpLogger.go @@ -18,7 +18,7 @@ func NewPcpLogger(logType int, prefix string) *PcpLogger { return pLog } -func (pLog *PcpLogger) Log(logType int, level log.Level, logData log.Fields, message string) { +func (pLog PcpLogger) Log(logType int, level log.Level, logData log.Fields, message string) { if pLog.Type == logType { logger.SetLevel(level) @@ -36,17 +36,16 @@ func (pLog *PcpLogger) Log(logType int, level log.Level, logData log.Fields, mes } } -func (plog *PcpLogger) SetLogFile(prefix string) { +func (pLog *PcpLogger) SetLogFile(prefix string) { - pcpLogPrefix := strings.Join([]string{prefix, config.PCPConfig.FilenameExtension}, "") + filename := strings.Join([]string{prefix, config.PCPConfig.FilenameExtension}, "") dirName := logDir.getDirName() if dirName != "" { - pcpLogPrefix = filepath.Join(dirName, pcpLogPrefix) - } - if logFile, err := os.Create(pcpLogPrefix); err != nil { - log.Fatal("Unable to create logFile: ", err) - } else { - plog.LogFileName = logFile - plog.AllowOnConsole = config.PCPConfig.AllowOnConsole + if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { + log.Fatal("Unable to create logFile: ", err) + } else { + pLog.LogFileName = logFile + pLog.AllowOnConsole = config.PCPConfig.AllowOnConsole + } } } diff --git a/elektronLogging/schedPolicySwitchLogger.go b/elektronLogging/schedPolicySwitchLogger.go index b6c7477..7275871 100644 --- a/elektronLogging/schedPolicySwitchLogger.go +++ b/elektronLogging/schedPolicySwitchLogger.go @@ -18,7 +18,7 @@ func NewSchedPolicySwitchLogger(logType int, prefix string) *SchedPolicySwitchLo return sLog } -func (sLog *SchedPolicySwitchLogger) Log(logType int, level log.Level, logData log.Fields, message string) { +func (sLog SchedPolicySwitchLogger) Log(logType int, level log.Level, logData log.Fields, message string) { if sLog.Type == logType { logger.SetLevel(level) @@ -38,15 +38,14 @@ func (sLog *SchedPolicySwitchLogger) Log(logType int, level log.Level, logData l func (sLog *SchedPolicySwitchLogger) SetLogFile(prefix string) { - spsLogPrefix := strings.Join([]string{prefix, config.SPSConfig.FilenameExtension}, "") + filename := strings.Join([]string{prefix, config.SPSConfig.FilenameExtension}, "") dirName := logDir.getDirName() if dirName != "" { - spsLogPrefix = filepath.Join(dirName, spsLogPrefix) - } - if logFile, err := os.Create(spsLogPrefix); err != nil { - log.Fatal("Unable to create logFile: ", err) - } else { - sLog.LogFileName = logFile - sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole + if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { + log.Fatal("Unable to create logFile: ", err) + } else { + sLog.LogFileName = logFile + sLog.AllowOnConsole = config.SPSConfig.AllowOnConsole + } } } diff --git a/elektronLogging/schedTraceLogger.go b/elektronLogging/schedTraceLogger.go index 91b06a9..da3df7c 100644 --- a/elektronLogging/schedTraceLogger.go +++ b/elektronLogging/schedTraceLogger.go @@ -18,7 +18,7 @@ func NewSchedTraceLogger(logType int, prefix string) *SchedTraceLogger { return sLog } -func (sLog *SchedTraceLogger) Log(logType int, level log.Level, logData log.Fields, message string) { +func (sLog SchedTraceLogger) Log(logType int, level log.Level, logData log.Fields, message string) { if sLog.Type == logType { logger.SetLevel(level) @@ -38,15 +38,14 @@ func (sLog *SchedTraceLogger) Log(logType int, level log.Level, logData log.Fiel func (sLog *SchedTraceLogger) SetLogFile(prefix string) { - schedTraceLogPrefix := strings.Join([]string{prefix, config.SchedTraceConfig.FilenameExtension}, "") + filename := strings.Join([]string{prefix, config.SchedTraceConfig.FilenameExtension}, "") dirName := logDir.getDirName() if dirName != "" { - schedTraceLogPrefix = filepath.Join(dirName, schedTraceLogPrefix) - } - if logFile, err := os.Create(schedTraceLogPrefix); err != nil { - log.Fatal("Unable to create logFile: ", err) - } else { - sLog.LogFileName = logFile - sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole + if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { + log.Fatal("Unable to create logFile: ", err) + } else { + sLog.LogFileName = logFile + sLog.AllowOnConsole = config.SchedTraceConfig.AllowOnConsole + } } } diff --git a/elektronLogging/schedWindowLogger.go b/elektronLogging/schedWindowLogger.go index 6297c44..e51677c 100644 --- a/elektronLogging/schedWindowLogger.go +++ b/elektronLogging/schedWindowLogger.go @@ -18,7 +18,7 @@ func NewSchedWindowLogger(logType int, prefix string) *SchedWindowLogger { return sLog } -func (sLog *SchedWindowLogger) Log(logType int, level log.Level, logData log.Fields, message string) { +func (sLog SchedWindowLogger) Log(logType int, level log.Level, logData log.Fields, message string) { if sLog.Type == logType { logger.SetLevel(level) @@ -38,15 +38,14 @@ func (sLog *SchedWindowLogger) Log(logType int, level log.Level, logData log.Fie func (sLog *SchedWindowLogger) SetLogFile(prefix string) { - schedWindowLogPrefix := strings.Join([]string{prefix, config.SchedWindowConfig.FilenameExtension}, "") + filename := strings.Join([]string{prefix, config.SchedWindowConfig.FilenameExtension}, "") dirName := logDir.getDirName() if dirName != "" { - schedWindowLogPrefix = filepath.Join(dirName, schedWindowLogPrefix) - } - if logFile, err := os.Create(schedWindowLogPrefix); err != nil { - log.Fatal("Unable to create logFile: ", err) - } else { - sLog.LogFileName = logFile - sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole + if logFile, err := os.Create(filepath.Join(dirName, filename)); err != nil { + log.Fatal("Unable to create logFile: ", err) + } else { + sLog.LogFileName = logFile + sLog.AllowOnConsole = config.SchedWindowConfig.AllowOnConsole + } } } diff --git a/logConfig.yaml b/logConfig.yaml index 24be410..9c4302b 100644 --- a/logConfig.yaml +++ b/logConfig.yaml @@ -1,36 +1,30 @@ schedTrace: enabled: true filenameExtension: _schedTrace.log - enablecolumnheaders: true allowOnConsole: true sps: enabled: false filenameExtension: _schedPolicySwitch.log - enableColumnHeaders: true allowOnConsole: true console: enabled: true filenameExtension: _console.log minLogLevel: debug - enableColumnHeaders: true + allowOnConsole: true pcp: enabled: true filenameExtension: .pcplog - enableColumnHeaders: true allowOnConsole: false schedWindow: enabled: true filenameExtension: _schedWindow.log - enableColumnHeaders: true allowOnConsole: true -clsfnTaskDistOverhead: +clsfnTaskDistrOverhead: enabled: true filenameExtension: _classificationOverhead.log - enableColumnHeaders: true allowOnConsole: true -# format. format: - level - timestamp