enhance: log level

Author: 0xJacky

frontend/src/components/StdDataEntry/StdFormItem.vue

@@ -35,8 +35,7 @@ const help = computed(() => {
 </script>
 
 <template>
-    <a-form-item :label="label" :extra="extra" :validate-status="valid_status" :help="help?.()"
-                 :required="tag.indexOf('required')>-1">
+    <a-form-item :label="label" :extra="extra" :validate-status="valid_status" :help="help?.()">
         <slot/>
     </a-form-item>
 </template>

frontend/src/version.json

@@ -1 +1 @@
-{"version":"1.9.9","build_id":108,"total_build":178}
+{"version":"1.9.9","build_id":109,"total_build":179}

frontend/version.json

@@ -1 +1 @@
-{"version":"1.9.9","build_id":108,"total_build":178}
+{"version":"1.9.9","build_id":109,"total_build":179}

logger/logger.go

@@ -1,20 +1,28 @@
 package logger
 
 import (
+	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"os"
 )
 
 var logger *zap.SugaredLogger
 
-func init() {
+func Init(runMode string) {
 	// First, define our level-handling logic.
 	highPriority := zap.LevelEnablerFunc(func(lvl zapcore.Level) bool {
 		return lvl >= zapcore.ErrorLevel
 	})
 	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.

main.go

@@ -1,39 +1,40 @@
 package main
 
 import (
-	"flag"
-	"fmt"
-	"github.com/0xJacky/Nginx-UI/logger"
-	"github.com/0xJacky/Nginx-UI/server"
-	"github.com/0xJacky/Nginx-UI/server/service"
-	"github.com/0xJacky/Nginx-UI/server/settings"
-	"github.com/gin-gonic/gin"
-	"github.com/jpillora/overseer"
-	"github.com/jpillora/overseer/fetcher"
-	"log"
+    "flag"
+    "fmt"
+    "github.com/0xJacky/Nginx-UI/logger"
+    "github.com/0xJacky/Nginx-UI/server"
+    "github.com/0xJacky/Nginx-UI/server/service"
+    "github.com/0xJacky/Nginx-UI/server/settings"
+    "github.com/gin-gonic/gin"
+    "github.com/jpillora/overseer"
+    "github.com/jpillora/overseer/fetcher"
 )
 
 func main() {
-	var confPath string
-	flag.StringVar(&confPath, "config", "app.ini", "Specify the configuration file")
-	flag.Parse()
+    var confPath string
+    flag.StringVar(&confPath, "config", "app.ini", "Specify the configuration file")
+    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 {
-		log.Fatalln(err)
-	}
+    r, err := service.GetRuntimeInfo()
 
-	overseer.Run(overseer.Config{
-		Program:          server.Program,
-		Address:          fmt.Sprintf(":%s", settings.ServerSettings.HttpPort),
-		Fetcher:          &fetcher.File{Path: r.ExPath},
-		TerminateTimeout: 0,
-	})
+    if err != nil {
+        logger.Fatal(err)
+    }
+
+    overseer.Run(overseer.Config{
+        Program:          server.Program,
+        Address:          fmt.Sprintf(":%s", settings.ServerSettings.HttpPort),
+        Fetcher:          &fetcher.File{Path: r.ExPath},
+        TerminateTimeout: 0,
+    })
 }

server/model/model.go

@@ -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 {
 	dbPath := path.Join(path.Dir(settings.ConfPath), fmt.Sprintf("%s.db", settings.ServerSettings.Database))
 
 	var err error
 	db, err = gorm.Open(sqlite.Open(dbPath), &gorm.Config{
-		Logger:                                   gormlogger.Default.LogMode(gormlogger.Info),
+		Logger:                                   logMode(),
 		PrepareStmt:                              true,
 		DisableForeignKeyConstraintWhenMigrating: true,
 	})

server/settings/settings.go

@@ -95,10 +95,9 @@ func Setup() {
 	var err error
 	Conf, err = ini.LooseLoad(ConfPath)
 	if err != nil {
-		log.Printf("setting.Setup: %v", err)
-	} else {
-		MapTo()
+		log.Fatalf("setting.Setup: %v\n", err)
 	}
+	MapTo()
 }
 
 func MapTo() {