mirror of
https://github.com/go-gitea/gitea
synced 2024-08-18 13:20:51 +02:00
Default log level to Info without hardcoding it in installer (#3041)
This commit is contained in:
parent
9a8805d785
commit
57edc3155f
@ -331,6 +331,7 @@ var (
|
|||||||
LibravatarService *libravatar.Libravatar
|
LibravatarService *libravatar.Libravatar
|
||||||
|
|
||||||
// Log settings
|
// Log settings
|
||||||
|
LogLevel string
|
||||||
LogRootPath string
|
LogRootPath string
|
||||||
LogModes []string
|
LogModes []string
|
||||||
LogConfigs []string
|
LogConfigs []string
|
||||||
@ -659,6 +660,7 @@ func NewContext() {
|
|||||||
}
|
}
|
||||||
homeDir = strings.Replace(homeDir, "\\", "/", -1)
|
homeDir = strings.Replace(homeDir, "\\", "/", -1)
|
||||||
|
|
||||||
|
LogLevel = getLogLevel("log", "LEVEL", "Info")
|
||||||
LogRootPath = Cfg.Section("log").Key("ROOT_PATH").MustString(path.Join(AppWorkPath, "log"))
|
LogRootPath = Cfg.Section("log").Key("ROOT_PATH").MustString(path.Join(AppWorkPath, "log"))
|
||||||
forcePathSeparator(LogRootPath)
|
forcePathSeparator(LogRootPath)
|
||||||
|
|
||||||
@ -1192,6 +1194,11 @@ var logLevels = map[string]string{
|
|||||||
"Critical": "5",
|
"Critical": "5",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func getLogLevel(section string, key string, defaultValue string) string {
|
||||||
|
validLevels := []string{"Trace", "Debug", "Info", "Warn", "Error", "Critical"}
|
||||||
|
return Cfg.Section(section).Key(key).In(defaultValue, validLevels)
|
||||||
|
}
|
||||||
|
|
||||||
func newLogService() {
|
func newLogService() {
|
||||||
log.Info("Gitea v%s%s", AppVer, AppBuiltWith)
|
log.Info("Gitea v%s%s", AppVer, AppBuiltWith)
|
||||||
|
|
||||||
@ -1216,11 +1223,8 @@ func newLogService() {
|
|||||||
sec, _ = Cfg.NewSection("log." + mode)
|
sec, _ = Cfg.NewSection("log." + mode)
|
||||||
}
|
}
|
||||||
|
|
||||||
validLevels := []string{"Trace", "Debug", "Info", "Warn", "Error", "Critical"}
|
|
||||||
// Log level.
|
// Log level.
|
||||||
levelName := Cfg.Section("log."+mode).Key("LEVEL").In(
|
levelName := getLogLevel("log."+mode, "LEVEL", LogLevel)
|
||||||
Cfg.Section("log").Key("LEVEL").In("Trace", validLevels),
|
|
||||||
validLevels)
|
|
||||||
level, ok := logLevels[levelName]
|
level, ok := logLevels[levelName]
|
||||||
if !ok {
|
if !ok {
|
||||||
log.Fatal(4, "Unknown log level: %s", levelName)
|
log.Fatal(4, "Unknown log level: %s", levelName)
|
||||||
@ -1284,11 +1288,8 @@ func NewXORMLogService(disableConsole bool) {
|
|||||||
sec, _ = Cfg.NewSection("log." + mode)
|
sec, _ = Cfg.NewSection("log." + mode)
|
||||||
}
|
}
|
||||||
|
|
||||||
validLevels := []string{"Trace", "Debug", "Info", "Warn", "Error", "Critical"}
|
|
||||||
// Log level.
|
// Log level.
|
||||||
levelName := Cfg.Section("log."+mode).Key("LEVEL").In(
|
levelName := getLogLevel("log."+mode, "LEVEL", LogLevel)
|
||||||
Cfg.Section("log").Key("LEVEL").In("Trace", validLevels),
|
|
||||||
validLevels)
|
|
||||||
level, ok := logLevels[levelName]
|
level, ok := logLevels[levelName]
|
||||||
if !ok {
|
if !ok {
|
||||||
log.Fatal(4, "Unknown log level: %s", levelName)
|
log.Fatal(4, "Unknown log level: %s", levelName)
|
||||||
|
@ -310,7 +310,7 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) {
|
|||||||
cfg.Section("session").Key("PROVIDER").SetValue("file")
|
cfg.Section("session").Key("PROVIDER").SetValue("file")
|
||||||
|
|
||||||
cfg.Section("log").Key("MODE").SetValue("file")
|
cfg.Section("log").Key("MODE").SetValue("file")
|
||||||
cfg.Section("log").Key("LEVEL").SetValue("Info")
|
cfg.Section("log").Key("LEVEL").SetValue(setting.LogLevel)
|
||||||
cfg.Section("log").Key("ROOT_PATH").SetValue(form.LogRootPath)
|
cfg.Section("log").Key("ROOT_PATH").SetValue(form.LogRootPath)
|
||||||
|
|
||||||
cfg.Section("security").Key("INSTALL_LOCK").SetValue("true")
|
cfg.Section("security").Key("INSTALL_LOCK").SetValue("true")
|
||||||
|
Loading…
Reference in New Issue
Block a user