feat:update log

This commit is contained in:
wenjianzhang
2020-07-24 18:10:25 +08:00
parent 0768efbcb3
commit f3adadd6ef
20 changed files with 194 additions and 146 deletions
+7
View File
@@ -13,6 +13,7 @@ type Application struct {
DemoMsg string
Domain string
IsHttps bool
Logger *Logger
}
func InitApplication(cfg *viper.Viper) *Application {
@@ -27,6 +28,12 @@ func InitApplication(cfg *viper.Viper) *Application {
DemoMsg: cfg.GetString("demoMsg"),
Domain: cfg.GetString("domain"),
IsHttps: cfg.GetBool("ishttps"),
Logger: &Logger{
Path: cfg.GetString("logger.path"),
Level: cfg.GetString("logger.level"),
Stdout: cfg.GetBool("logger.stdout"),
Enabled: cfg.GetBool("logger.enabled"),
},
}
}
+5 -5
View File
@@ -12,7 +12,7 @@ import (
var cfgDatabase *viper.Viper
var cfgApplication *viper.Viper
var cfgJwt *viper.Viper
var cfgLog *viper.Viper
var cfgLogger *viper.Viper
var cfgSsl *viper.Viper
var cfgGen *viper.Viper
@@ -48,11 +48,11 @@ func ConfigSetup(path string) {
}
JwtConfig = InitJwt(cfgJwt)
cfgLog = viper.Sub("settings.log")
if cfgLog == nil {
panic("config not found settings.log")
cfgLogger = viper.Sub("settings.logger")
if cfgLogger == nil {
panic("config not found settings.logger")
}
LogConfig = InitLog(cfgLog)
LoggerConfig = InitLog(cfgLogger)
cfgSsl = viper.Sub("settings.ssl")
if cfgSsl == nil {
+7
View File
@@ -6,6 +6,7 @@ type Database struct {
Driver string
Source string
DBName string
Logger *Logger
}
func InitDatabase(cfg *viper.Viper) *Database {
@@ -14,6 +15,12 @@ func InitDatabase(cfg *viper.Viper) *Database {
Driver: cfg.GetString("driver"),
Source: cfg.GetString("source"),
DBName: cfg.GetString("dbname"),
Logger: &Logger{
Path: cfg.GetString("logger.path"),
Level: cfg.GetString("logger.level"),
Stdout: cfg.GetBool("logger.stdout"),
Enabled: cfg.GetBool("logger.enabled"),
},
}
return db
}
-17
View File
@@ -1,17 +0,0 @@
package config
import "github.com/spf13/viper"
type Log struct {
Dir string
Operdb bool
}
func InitLog(cfg *viper.Viper) *Log {
return &Log{
Dir: cfg.GetString("dir"),
Operdb: cfg.GetBool("operdb"),
}
}
var LogConfig = new(Log)
+21
View File
@@ -0,0 +1,21 @@
package config
import "github.com/spf13/viper"
type Logger struct {
Path string
Level string
Stdout bool
Enabled bool
}
func InitLog(cfg *viper.Viper) *Logger {
return &Logger{
Path: cfg.GetString("path"),
Level: cfg.GetString("level"),
Enabled: cfg.GetBool("enabled"),
Stdout: cfg.GetBool("stdout"),
}
}
var LoggerConfig = new(Logger)