fixed visibility of structs.
This commit is contained in:
parent
f084eddd68
commit
5a53998942
9 changed files with 61 additions and 61 deletions
|
@ -8,19 +8,19 @@ import (
|
|||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type ClsfnTaskDistrOverheadLogger struct {
|
||||
type clsfnTaskDistrOverheadLogger struct {
|
||||
baseElektronLogger
|
||||
}
|
||||
|
||||
func NewClsfnTaskDistrOverheadLogger(
|
||||
config *LoggerConfig,
|
||||
func newClsfnTaskDistrOverheadLogger(
|
||||
config *loggerConfig,
|
||||
b *baseLogData,
|
||||
logType int,
|
||||
prefix string,
|
||||
logger *log.Logger,
|
||||
logDir *logDirectory) *ClsfnTaskDistrOverheadLogger {
|
||||
logDir *logDirectory) *clsfnTaskDistrOverheadLogger {
|
||||
|
||||
cLog := &ClsfnTaskDistrOverheadLogger{
|
||||
cLog := &clsfnTaskDistrOverheadLogger{
|
||||
baseElektronLogger: baseElektronLogger{
|
||||
baseLogData: b,
|
||||
config: struct {
|
||||
|
@ -42,7 +42,7 @@ func NewClsfnTaskDistrOverheadLogger(
|
|||
cLog.createLogFile(prefix)
|
||||
return cLog
|
||||
}
|
||||
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.isEnabled() {
|
||||
if cLog.config.AllowOnConsole {
|
||||
|
@ -63,7 +63,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.isEnabled() {
|
||||
if cLog.config.AllowOnConsole {
|
||||
|
@ -83,7 +83,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() {
|
||||
filename := strings.Join([]string{prefix, cLog.config.FilenameExtension}, "")
|
||||
|
|
|
@ -8,20 +8,20 @@ import (
|
|||
"strings"
|
||||
)
|
||||
|
||||
type ConsoleLogger struct {
|
||||
type consoleLogger struct {
|
||||
baseElektronLogger
|
||||
MinLogLevel string
|
||||
}
|
||||
|
||||
func NewConsoleLogger(
|
||||
config *LoggerConfig,
|
||||
func newConsoleLogger(
|
||||
config *loggerConfig,
|
||||
b *baseLogData,
|
||||
logType int,
|
||||
prefix string,
|
||||
logger *log.Logger,
|
||||
logDir *logDirectory) *ConsoleLogger {
|
||||
logDir *logDirectory) *consoleLogger {
|
||||
|
||||
cLog := &ConsoleLogger{
|
||||
cLog := &consoleLogger{
|
||||
baseElektronLogger: baseElektronLogger{
|
||||
baseLogData: b,
|
||||
config: struct {
|
||||
|
@ -46,7 +46,7 @@ func NewConsoleLogger(
|
|||
return cLog
|
||||
}
|
||||
|
||||
func (cLog ConsoleLogger) Log(logType int, level log.Level, message string) {
|
||||
func (cLog consoleLogger) Log(logType int, level log.Level, message string) {
|
||||
if logType <= cLog.logType {
|
||||
if cLog.isEnabled() {
|
||||
cLog.logger.SetOutput(os.Stdout)
|
||||
|
@ -65,7 +65,7 @@ func (cLog ConsoleLogger) Log(logType int, level log.Level, message string) {
|
|||
}
|
||||
}
|
||||
|
||||
func (cLog ConsoleLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
|
||||
func (cLog consoleLogger) Logf(logType int, level log.Level, msgFmtString string, args ...interface{}) {
|
||||
if logType <= cLog.logType {
|
||||
if cLog.isEnabled() {
|
||||
cLog.logger.SetOutput(os.Stdout)
|
||||
|
@ -83,7 +83,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.
|
||||
if cLog.isEnabled() {
|
||||
filename := strings.Join([]string{prefix, cLog.config.FilenameExtension}, "")
|
||||
|
|
|
@ -8,11 +8,11 @@ import (
|
|||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type ElektronFormatter struct {
|
||||
type elektronFormatter struct {
|
||||
TimestampFormat string
|
||||
}
|
||||
|
||||
func (f ElektronFormatter) Format(entry *log.Entry) ([]byte, error) {
|
||||
func (f elektronFormatter) Format(entry *log.Entry) ([]byte, error) {
|
||||
var b *bytes.Buffer
|
||||
|
||||
if entry.Buffer != nil {
|
|
@ -10,8 +10,8 @@ import (
|
|||
. "github.com/spdfg/elektron/logging/types"
|
||||
)
|
||||
|
||||
// var config LoggerConfig
|
||||
var formatter ElektronFormatter
|
||||
// var config loggerConfig
|
||||
var formatter elektronFormatter
|
||||
var elektronLoggerInstance elektronLogger
|
||||
|
||||
type elektronLogger interface {
|
||||
|
@ -103,12 +103,12 @@ func BuildLogger(prefix string, logConfigFilename string) error {
|
|||
if config, err := GetConfig(logConfigFilename); err != nil {
|
||||
return errors.Wrap(err, "Failed to build logger")
|
||||
} else {
|
||||
cLog := NewConsoleLogger(config, b, CONSOLE, prefix, logger, logDir)
|
||||
pLog := NewPCPLogger(config, b, PCP, prefix, logger, logDir)
|
||||
schedTraceLog := NewSchedTraceLogger(config, b, SCHED_TRACE, prefix, logger, logDir)
|
||||
spsLog := NewSchedPolicySwitchLogger(config, b, SPS, prefix, logger, logDir)
|
||||
schedWindowLog := NewSchedWindowLogger(config, b, SCHED_WINDOW, prefix, logger, logDir)
|
||||
tskDistLog := NewClsfnTaskDistrOverheadLogger(config, b, CLSFN_TASKDISTR_OVERHEAD, prefix, logger, logDir)
|
||||
cLog := newConsoleLogger(config, b, CONSOLE, prefix, logger, logDir)
|
||||
pLog := newPCPLogger(config, b, PCP, prefix, logger, logDir)
|
||||
schedTraceLog := newSchedTraceLogger(config, b, SCHED_TRACE, prefix, logger, logDir)
|
||||
spsLog := newSchedPolicySwitchLogger(config, b, SPS, prefix, logger, logDir)
|
||||
schedWindowLog := newSchedWindowLogger(config, b, SCHED_WINDOW, prefix, logger, logDir)
|
||||
tskDistLog := newClsfnTaskDistrOverheadLogger(config, b, CLSFN_TASKDISTR_OVERHEAD, prefix, logger, logDir)
|
||||
|
||||
head.setNext(cLog)
|
||||
cLog.setNext(pLog)
|
||||
|
|
|
@ -7,7 +7,7 @@ import (
|
|||
"io/ioutil"
|
||||
)
|
||||
|
||||
type LoggerConfig struct {
|
||||
type loggerConfig struct {
|
||||
SchedTraceConfig struct {
|
||||
Enabled bool `yaml:"enabled"`
|
||||
FilenameExtension string `yaml:"filenameExtension"`
|
||||
|
@ -48,14 +48,14 @@ type LoggerConfig struct {
|
|||
Format []string `yaml:"format"`
|
||||
}
|
||||
|
||||
func GetConfig(logConfigFilename string) (*LoggerConfig, error) {
|
||||
func GetConfig(logConfigFilename string) (*loggerConfig, error) {
|
||||
|
||||
yamlFile, err := ioutil.ReadFile(logConfigFilename)
|
||||
if err != nil {
|
||||
return nil, errors.Wrap(err, "failed to read log config file")
|
||||
}
|
||||
|
||||
c := &LoggerConfig{}
|
||||
c := &loggerConfig{}
|
||||
err = yaml.Unmarshal(yamlFile, c)
|
||||
if err != nil {
|
||||
log.Fatalf("Error in unmarshalling yaml: %v", err)
|
||||
|
|
|
@ -8,19 +8,19 @@ import (
|
|||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type PCPLogger struct {
|
||||
type pcpLogger struct {
|
||||
baseElektronLogger
|
||||
}
|
||||
|
||||
func NewPCPLogger(
|
||||
config *LoggerConfig,
|
||||
func newPCPLogger(
|
||||
config *loggerConfig,
|
||||
b *baseLogData,
|
||||
logType int,
|
||||
prefix string,
|
||||
logger *log.Logger,
|
||||
logDir *logDirectory) *PCPLogger {
|
||||
logDir *logDirectory) *pcpLogger {
|
||||
|
||||
pLog := &PCPLogger{
|
||||
pLog := &pcpLogger{
|
||||
baseElektronLogger: baseElektronLogger{
|
||||
baseLogData: b,
|
||||
config: struct {
|
||||
|
@ -43,7 +43,7 @@ func NewPCPLogger(
|
|||
return pLog
|
||||
}
|
||||
|
||||
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.isEnabled() {
|
||||
if pLog.config.AllowOnConsole {
|
||||
|
@ -63,7 +63,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.isEnabled() {
|
||||
if pLog.config.AllowOnConsole {
|
||||
|
@ -84,7 +84,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() {
|
||||
filename := strings.Join([]string{prefix, pLog.config.FilenameExtension}, "")
|
||||
dirName := pLog.logDir.getDirName()
|
||||
|
|
|
@ -8,19 +8,19 @@ import (
|
|||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type SchedPolicySwitchLogger struct {
|
||||
type schedPolicySwitchLogger struct {
|
||||
baseElektronLogger
|
||||
}
|
||||
|
||||
func NewSchedPolicySwitchLogger(
|
||||
config *LoggerConfig,
|
||||
func newSchedPolicySwitchLogger(
|
||||
config *loggerConfig,
|
||||
b *baseLogData,
|
||||
logType int,
|
||||
prefix string,
|
||||
logger *log.Logger,
|
||||
logDir *logDirectory) *SchedPolicySwitchLogger {
|
||||
logDir *logDirectory) *schedPolicySwitchLogger {
|
||||
|
||||
sLog := &SchedPolicySwitchLogger{
|
||||
sLog := &schedPolicySwitchLogger{
|
||||
baseElektronLogger: baseElektronLogger{
|
||||
baseLogData: b,
|
||||
config: struct {
|
||||
|
@ -43,7 +43,7 @@ func NewSchedPolicySwitchLogger(
|
|||
return sLog
|
||||
}
|
||||
|
||||
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.isEnabled() {
|
||||
if sLog.config.AllowOnConsole {
|
||||
|
@ -63,7 +63,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.isEnabled() {
|
||||
if sLog.config.AllowOnConsole {
|
||||
|
@ -84,7 +84,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() {
|
||||
filename := strings.Join([]string{prefix, sLog.config.FilenameExtension}, "")
|
||||
dirName := sLog.logDir.getDirName()
|
||||
|
|
|
@ -8,19 +8,19 @@ import (
|
|||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type SchedTraceLogger struct {
|
||||
type schedTraceLogger struct {
|
||||
baseElektronLogger
|
||||
}
|
||||
|
||||
func NewSchedTraceLogger(
|
||||
config *LoggerConfig,
|
||||
func newSchedTraceLogger(
|
||||
config *loggerConfig,
|
||||
b *baseLogData,
|
||||
logType int,
|
||||
prefix string,
|
||||
logger *log.Logger,
|
||||
logDir *logDirectory) *SchedTraceLogger {
|
||||
logDir *logDirectory) *schedTraceLogger {
|
||||
|
||||
sLog := &SchedTraceLogger{
|
||||
sLog := &schedTraceLogger{
|
||||
baseElektronLogger: baseElektronLogger{
|
||||
baseLogData: b,
|
||||
config: struct {
|
||||
|
@ -43,7 +43,7 @@ func NewSchedTraceLogger(
|
|||
return sLog
|
||||
}
|
||||
|
||||
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.isEnabled() {
|
||||
if sLog.config.AllowOnConsole {
|
||||
|
@ -63,7 +63,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.isEnabled() {
|
||||
if sLog.config.AllowOnConsole {
|
||||
|
@ -84,7 +84,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() {
|
||||
filename := strings.Join([]string{prefix, sLog.config.FilenameExtension}, "")
|
||||
dirName := sLog.logDir.getDirName()
|
||||
|
|
|
@ -8,19 +8,19 @@ import (
|
|||
log "github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
type SchedWindowLogger struct {
|
||||
type schedWindowLogger struct {
|
||||
baseElektronLogger
|
||||
}
|
||||
|
||||
func NewSchedWindowLogger(
|
||||
config *LoggerConfig,
|
||||
func newSchedWindowLogger(
|
||||
config *loggerConfig,
|
||||
b *baseLogData,
|
||||
logType int,
|
||||
prefix string,
|
||||
logger *log.Logger,
|
||||
logDir *logDirectory) *SchedWindowLogger {
|
||||
logDir *logDirectory) *schedWindowLogger {
|
||||
|
||||
sLog := &SchedWindowLogger{
|
||||
sLog := &schedWindowLogger{
|
||||
baseElektronLogger: baseElektronLogger{
|
||||
baseLogData: b,
|
||||
config: struct {
|
||||
|
@ -43,7 +43,7 @@ func NewSchedWindowLogger(
|
|||
return sLog
|
||||
}
|
||||
|
||||
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.isEnabled() {
|
||||
if sLog.config.AllowOnConsole {
|
||||
|
@ -64,7 +64,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.isEnabled() {
|
||||
if sLog.config.AllowOnConsole {
|
||||
|
@ -84,7 +84,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() {
|
||||
filename := strings.Join([]string{prefix, sLog.config.FilenameExtension}, "")
|
||||
dirName := sLog.logDir.getDirName()
|
||||
|
|
Reference in a new issue