mirror of
https://github.com/0xJacky/nginx-ui.git
synced 2025-05-11 02:15:48 +02:00
enhance: log level
This commit is contained in:
parent
59ca8d9eb8
commit
af12612343
7 changed files with 54 additions and 36 deletions
|
@ -35,8 +35,7 @@ const help = computed(() => {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<a-form-item :label="label" :extra="extra" :validate-status="valid_status" :help="help?.()"
|
<a-form-item :label="label" :extra="extra" :validate-status="valid_status" :help="help?.()">
|
||||||
:required="tag.indexOf('required')>-1">
|
|
||||||
<slot/>
|
<slot/>
|
||||||
</a-form-item>
|
</a-form-item>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
{"version":"1.9.9","build_id":108,"total_build":178}
|
{"version":"1.9.9","build_id":109,"total_build":179}
|
|
@ -1 +1 @@
|
||||||
{"version":"1.9.9","build_id":108,"total_build":178}
|
{"version":"1.9.9","build_id":109,"total_build":179}
|
|
@ -1,6 +1,7 @@
|
||||||
package logger
|
package logger
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"github.com/gin-gonic/gin"
|
||||||
"go.uber.org/zap"
|
"go.uber.org/zap"
|
||||||
"go.uber.org/zap/zapcore"
|
"go.uber.org/zap/zapcore"
|
||||||
"os"
|
"os"
|
||||||
|
@ -8,13 +9,20 @@ import (
|
||||||
|
|
||||||
var logger *zap.SugaredLogger
|
var logger *zap.SugaredLogger
|
||||||
|
|
||||||
func init() {
|
func Init(runMode string) {
|
||||||
// First, define our level-handling logic.
|
// First, define our level-handling logic.
|
||||||
highPriority := zap.LevelEnablerFunc(func(lvl zapcore.Level) bool {
|
highPriority := zap.LevelEnablerFunc(func(lvl zapcore.Level) bool {
|
||||||
return lvl >= zapcore.ErrorLevel
|
return lvl >= zapcore.ErrorLevel
|
||||||
})
|
})
|
||||||
lowPriority := zap.LevelEnablerFunc(func(lvl zapcore.Level) bool {
|
lowPriority := zap.LevelEnablerFunc(func(lvl zapcore.Level) bool {
|
||||||
return lvl < zapcore.ErrorLevel
|
switch runMode {
|
||||||
|
case gin.ReleaseMode:
|
||||||
|
return lvl >= zapcore.InfoLevel && lvl < zapcore.ErrorLevel
|
||||||
|
default:
|
||||||
|
fallthrough
|
||||||
|
case gin.DebugMode:
|
||||||
|
return lvl < zapcore.ErrorLevel
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// Directly output to stdout and stderr, and add caller information.
|
// Directly output to stdout and stderr, and add caller information.
|
||||||
|
|
53
main.go
53
main.go
|
@ -1,39 +1,40 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"flag"
|
"flag"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/0xJacky/Nginx-UI/logger"
|
"github.com/0xJacky/Nginx-UI/logger"
|
||||||
"github.com/0xJacky/Nginx-UI/server"
|
"github.com/0xJacky/Nginx-UI/server"
|
||||||
"github.com/0xJacky/Nginx-UI/server/service"
|
"github.com/0xJacky/Nginx-UI/server/service"
|
||||||
"github.com/0xJacky/Nginx-UI/server/settings"
|
"github.com/0xJacky/Nginx-UI/server/settings"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/jpillora/overseer"
|
"github.com/jpillora/overseer"
|
||||||
"github.com/jpillora/overseer/fetcher"
|
"github.com/jpillora/overseer/fetcher"
|
||||||
"log"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
var confPath string
|
var confPath string
|
||||||
flag.StringVar(&confPath, "config", "app.ini", "Specify the configuration file")
|
flag.StringVar(&confPath, "config", "app.ini", "Specify the configuration file")
|
||||||
flag.Parse()
|
flag.Parse()
|
||||||
|
|
||||||
settings.Init(confPath)
|
settings.Init(confPath)
|
||||||
|
|
||||||
gin.SetMode(settings.ServerSettings.RunMode)
|
logger.Init(settings.ServerSettings.RunMode)
|
||||||
|
|
||||||
r, err := service.GetRuntimeInfo()
|
gin.SetMode(settings.ServerSettings.RunMode)
|
||||||
|
|
||||||
defer logger.Sync()
|
defer logger.Sync()
|
||||||
|
|
||||||
if err != nil {
|
r, err := service.GetRuntimeInfo()
|
||||||
log.Fatalln(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
overseer.Run(overseer.Config{
|
if err != nil {
|
||||||
Program: server.Program,
|
logger.Fatal(err)
|
||||||
Address: fmt.Sprintf(":%s", settings.ServerSettings.HttpPort),
|
}
|
||||||
Fetcher: &fetcher.File{Path: r.ExPath},
|
|
||||||
TerminateTimeout: 0,
|
overseer.Run(overseer.Config{
|
||||||
})
|
Program: server.Program,
|
||||||
|
Address: fmt.Sprintf(":%s", settings.ServerSettings.HttpPort),
|
||||||
|
Fetcher: &fetcher.File{Path: r.ExPath},
|
||||||
|
TerminateTimeout: 0,
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,12 +35,23 @@ func GenerateAllModel() []any {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func logMode() gormlogger.Interface {
|
||||||
|
switch settings.ServerSettings.RunMode {
|
||||||
|
case gin.ReleaseMode:
|
||||||
|
return gormlogger.Default.LogMode(gormlogger.Warn)
|
||||||
|
default:
|
||||||
|
fallthrough
|
||||||
|
case gin.DebugMode:
|
||||||
|
return gormlogger.Default.LogMode(gormlogger.Info)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func Init() *gorm.DB {
|
func Init() *gorm.DB {
|
||||||
dbPath := path.Join(path.Dir(settings.ConfPath), fmt.Sprintf("%s.db", settings.ServerSettings.Database))
|
dbPath := path.Join(path.Dir(settings.ConfPath), fmt.Sprintf("%s.db", settings.ServerSettings.Database))
|
||||||
|
|
||||||
var err error
|
var err error
|
||||||
db, err = gorm.Open(sqlite.Open(dbPath), &gorm.Config{
|
db, err = gorm.Open(sqlite.Open(dbPath), &gorm.Config{
|
||||||
Logger: gormlogger.Default.LogMode(gormlogger.Info),
|
Logger: logMode(),
|
||||||
PrepareStmt: true,
|
PrepareStmt: true,
|
||||||
DisableForeignKeyConstraintWhenMigrating: true,
|
DisableForeignKeyConstraintWhenMigrating: true,
|
||||||
})
|
})
|
||||||
|
|
|
@ -95,10 +95,9 @@ func Setup() {
|
||||||
var err error
|
var err error
|
||||||
Conf, err = ini.LooseLoad(ConfPath)
|
Conf, err = ini.LooseLoad(ConfPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("setting.Setup: %v", err)
|
log.Fatalf("setting.Setup: %v\n", err)
|
||||||
} else {
|
|
||||||
MapTo()
|
|
||||||
}
|
}
|
||||||
|
MapTo()
|
||||||
}
|
}
|
||||||
|
|
||||||
func MapTo() {
|
func MapTo() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue