|
@@ -99,13 +99,15 @@ func RichLogger(name string) (*Logger, error) {
|
|
|
func FileLogger(name string, level Level, format string, timeFormat string, file string, sync bool) (*Logger, error) {
|
|
func FileLogger(name string, level Level, format string, timeFormat string, file string, sync bool) (*Logger, error) {
|
|
|
out, err := os.Create(file)
|
|
out, err := os.Create(file)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
- return new(Logger), err
|
|
|
|
|
|
|
+ return nil, err
|
|
|
}
|
|
}
|
|
|
logger, err := createLogger(name, level, format, timeFormat, out, sync)
|
|
logger, err := createLogger(name, level, format, timeFormat, out, sync)
|
|
|
if err == nil {
|
|
if err == nil {
|
|
|
logger.fd = out
|
|
logger.fd = out
|
|
|
|
|
+ return logger, nil
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return nil, err
|
|
|
}
|
|
}
|
|
|
- return logger, err
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// WriterLogger creates a new logger with a writer
|
|
// WriterLogger creates a new logger with a writer
|
|
@@ -115,38 +117,35 @@ func WriterLogger(name string, level Level, format string, timeFormat string, ou
|
|
|
|
|
|
|
|
// WriterLogger creates a new logger from a configuration file
|
|
// WriterLogger creates a new logger from a configuration file
|
|
|
func ConfigLogger(filename string) (*Logger, error) {
|
|
func ConfigLogger(filename string) (*Logger, error) {
|
|
|
- conf, err := config.Read(filename)
|
|
|
|
|
|
|
+ conf := config.NewConfig(filename)
|
|
|
|
|
+ err := conf.Read()
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
- return new(Logger), err
|
|
|
|
|
- }
|
|
|
|
|
- ok := true
|
|
|
|
|
- name, ok := conf["name"]
|
|
|
|
|
- if !ok {
|
|
|
|
|
- name = ""
|
|
|
|
|
|
|
+ return nil, err
|
|
|
}
|
|
}
|
|
|
- slevel, ok := conf["level"]
|
|
|
|
|
- if !ok {
|
|
|
|
|
|
|
+ name := conf.Get("", "name")
|
|
|
|
|
+ slevel := conf.Get("", "level")
|
|
|
|
|
+ if slevel == "" {
|
|
|
slevel = "0"
|
|
slevel = "0"
|
|
|
}
|
|
}
|
|
|
l, err := strconv.Atoi(slevel)
|
|
l, err := strconv.Atoi(slevel)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
- return new(Logger), err
|
|
|
|
|
|
|
+ return nil, err
|
|
|
}
|
|
}
|
|
|
level := Level(l)
|
|
level := Level(l)
|
|
|
- format, ok := conf["format"]
|
|
|
|
|
- if !ok {
|
|
|
|
|
|
|
+ format := conf.Get("", "format")
|
|
|
|
|
+ if format == "" {
|
|
|
format = BasicFormat
|
|
format = BasicFormat
|
|
|
}
|
|
}
|
|
|
- timeFormat, ok := conf["timeFormat"]
|
|
|
|
|
- if !ok {
|
|
|
|
|
|
|
+ timeFormat := conf.Get("", "timeFormat")
|
|
|
|
|
+ if timeFormat == "" {
|
|
|
timeFormat = DefaultTimeFormat
|
|
timeFormat = DefaultTimeFormat
|
|
|
}
|
|
}
|
|
|
- ssync, ok := conf["sync"]
|
|
|
|
|
- if !ok {
|
|
|
|
|
|
|
+ ssync := conf.Get("", "sync")
|
|
|
|
|
+ if ssync == "" {
|
|
|
ssync = "0"
|
|
ssync = "0"
|
|
|
}
|
|
}
|
|
|
- file, ok := conf["file"]
|
|
|
|
|
- if !ok {
|
|
|
|
|
|
|
+ file := conf.Get("", "file")
|
|
|
|
|
+ if file == "" {
|
|
|
file = DefaultFileName
|
|
file = DefaultFileName
|
|
|
}
|
|
}
|
|
|
sync := true
|
|
sync := true
|
|
@@ -155,7 +154,7 @@ func ConfigLogger(filename string) (*Logger, error) {
|
|
|
} else if ssync == "1" {
|
|
} else if ssync == "1" {
|
|
|
sync = true
|
|
sync = true
|
|
|
} else {
|
|
} else {
|
|
|
- return new(Logger), err
|
|
|
|
|
|
|
+ return nil, err
|
|
|
}
|
|
}
|
|
|
return FileLogger(name, level, format, timeFormat, file, sync)
|
|
return FileLogger(name, level, format, timeFormat, file, sync)
|
|
|
}
|
|
}
|
|
@@ -166,7 +165,7 @@ func createLogger(name string, level Level, format string, timeFormat string, ou
|
|
|
|
|
|
|
|
err := logger.parseFormat(format)
|
|
err := logger.parseFormat(format)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
- return logger, err
|
|
|
|
|
|
|
+ return nil, err
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// asign values to logger
|
|
// asign values to logger
|