chore: move logger into internal

main.go

@@ -1,40 +1,36 @@
 package main
 
 import (
-    "flag"
+	"flag"
-    "fmt"
+	"fmt"
-    "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() {
-    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)
 
-    logger.Init(settings.ServerSettings.RunMode)
+	gin.SetMode(settings.ServerSettings.RunMode)
 
-    gin.SetMode(settings.ServerSettings.RunMode)
+	r, err := service.GetRuntimeInfo()
 
-    defer logger.Sync()
+	if err != nil {
+		log.Fatalln(err)
+	}
 
-    r, err := service.GetRuntimeInfo()
+	overseer.Run(overseer.Config{
-
+		Program:          server.Program,
-    if err != nil {
+		Address:          fmt.Sprintf(":%s", settings.ServerSettings.HttpPort),
-        logger.Fatal(err)
+		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,
-    })
 }

server/api/analytic.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"fmt"
-	"github.com/0xJacky/Nginx-UI/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/analytic"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/pkg/errors"
 	"github.com/shirou/gopsutil/v3/cpu"
 	"github.com/shirou/gopsutil/v3/disk"

server/api/api.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"github.com/0xJacky/Nginx-UI/logger"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/gin-gonic/gin"
 	val "github.com/go-playground/validator/v10"
 	"net/http"

server/api/cert.go

@@ -1,9 +1,9 @@
 package api
 
 import (
-	"github.com/0xJacky/Nginx-UI/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/cert"
 	"github.com/0xJacky/Nginx-UI/server/internal/cert/dns"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
 	"github.com/0xJacky/Nginx-UI/server/model"
 	"github.com/gin-gonic/gin"

server/api/config.go

@@ -1,8 +1,8 @@
 package api
 
 import (
-	"github.com/0xJacky/Nginx-UI/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/config_list"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
 	"github.com/0xJacky/Nginx-UI/server/query"
 	"github.com/gin-gonic/gin"

server/api/domain.go

@@ -1,10 +1,10 @@
 package api
 
 import (
-	"github.com/0xJacky/Nginx-UI/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/cert"
 	"github.com/0xJacky/Nginx-UI/server/internal/config_list"
 	"github.com/0xJacky/Nginx-UI/server/internal/helper"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
 	"github.com/0xJacky/Nginx-UI/server/model"
 	"github.com/0xJacky/Nginx-UI/server/query"

server/api/nginx_log.go

@@ -2,8 +2,8 @@ package api
 
 import (
 	"encoding/json"
-	"github.com/0xJacky/Nginx-UI/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/helper"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
 	"github.com/0xJacky/Nginx-UI/server/settings"
 	"github.com/gin-gonic/gin"

server/api/pty.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"github.com/0xJacky/Nginx-UI/logger"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/pty"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"

server/api/upgrade.go

@@ -1,7 +1,7 @@
 package api
 
 import (
-	"github.com/0xJacky/Nginx-UI/logger"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/0xJacky/Nginx-UI/server/service"
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"

server/internal/analytic/analytic.go

@@ -1,7 +1,7 @@
 package analytic
 
 import (
-	"github.com/0xJacky/Nginx-UI/logger"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/shirou/gopsutil/v3/net"
 	"time"
 )

server/internal/analytic/record.go

@@ -1,7 +1,7 @@
 package analytic
 
 import (
-	"github.com/0xJacky/Nginx-UI/logger"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/shirou/gopsutil/v3/cpu"
 	"github.com/shirou/gopsutil/v3/disk"
 	"github.com/shirou/gopsutil/v3/net"

server/internal/cert/auto_cert.go

@@ -2,7 +2,7 @@ package cert
 
 import (
 	"fmt"
-	"github.com/0xJacky/Nginx-UI/logger"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/0xJacky/Nginx-UI/server/model"
 	"github.com/pkg/errors"
 	"time"

server/internal/cert/cert.go

@@ -6,8 +6,8 @@ import (
 	"crypto/elliptic"
 	"crypto/rand"
 	"crypto/tls"
-	"github.com/0xJacky/Nginx-UI/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/cert/dns"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
 	"github.com/0xJacky/Nginx-UI/server/query"
 	"github.com/0xJacky/Nginx-UI/server/settings"

server/internal/helper/hash.go

@@ -3,7 +3,7 @@ package helper
 import (
 	"crypto/sha512"
 	"fmt"
-	"github.com/0xJacky/Nginx-UI/logger"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"io"
 	"os"
 )

server/internal/logger/logger.go

@@ -1,21 +1,22 @@
 package logger
 
 import (
-	"github.com/gin-gonic/gin"
+    "github.com/0xJacky/Nginx-UI/server/settings"
-	"go.uber.org/zap"
+    "github.com/gin-gonic/gin"
-	"go.uber.org/zap/zapcore"
+    "go.uber.org/zap"
-	"os"
+    "go.uber.org/zap/zapcore"
+    "os"
 )
 
 var logger *zap.SugaredLogger
 
-func Init(runMode string) {
+func init() {
 	// 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 {
-		switch runMode {
+		switch settings.ServerSettings.RunMode {
 		case gin.ReleaseMode:
 			return lvl >= zapcore.InfoLevel && lvl < zapcore.ErrorLevel
 		default:

server/internal/nginx/nginx.go

@@ -1,7 +1,7 @@
 package nginx
 
 import (
-	"github.com/0xJacky/Nginx-UI/logger"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/0xJacky/Nginx-UI/server/settings"
 	"os/exec"
 	"path/filepath"

server/model/config_backup.go

@@ -1,9 +1,9 @@
 package model
 
 import (
-    "github.com/0xJacky/Nginx-UI/logger"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
-    "os"
+	"os"
-    "path/filepath"
+	"path/filepath"
 )
 
 type ConfigBackup struct {
@@ -38,12 +38,12 @@ func GetBackup(id int) (config ConfigBackup) {
 func CreateBackup(path string) {
 	content, err := os.ReadFile(path)
 	if err != nil {
-        logger.Error(err)
+		logger.Error(err)
 	}
 
 	config := ConfigBackup{Name: filepath.Base(path), FilePath: path, Content: string(content)}
 	result := db.Create(&config)
 	if result.Error != nil {
-        logger.Error(result.Error)
+		logger.Error(result.Error)
 	}
 }

server/model/model.go

@@ -2,7 +2,7 @@ package model
 
 import (
 	"fmt"
-	"github.com/0xJacky/Nginx-UI/logger"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/0xJacky/Nginx-UI/server/settings"
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/cast"

server/router/middleware.go

@@ -3,7 +3,7 @@ package router
 import (
 	"encoding/base64"
 	"github.com/0xJacky/Nginx-UI/frontend"
-	"github.com/0xJacky/Nginx-UI/logger"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/0xJacky/Nginx-UI/server/model"
 	"github.com/0xJacky/Nginx-UI/server/settings"
 	"github.com/gin-contrib/static"

server/server.go

@@ -1,9 +1,9 @@
 package server
 
 import (
-	"github.com/0xJacky/Nginx-UI/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/analytic"
 	"github.com/0xJacky/Nginx-UI/server/internal/cert"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
 	"github.com/0xJacky/Nginx-UI/server/model"
 	"github.com/0xJacky/Nginx-UI/server/query"
@@ -18,6 +18,7 @@ import (
 )
 
 func Program(state overseer.State) {
+	defer logger.Sync()
 	// Hack: fix wrong Content Type of .js file on some OS platforms
 	// See https://github.com/golang/go/issues/32350
 	_ = mime.AddExtensionType(".js", "text/javascript; charset=utf-8")

server/service/template.go

@@ -3,7 +3,7 @@ package service
 import (
 	"bufio"
 	"bytes"
-	"github.com/0xJacky/Nginx-UI/logger"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/nginx"
 	"github.com/0xJacky/Nginx-UI/server/settings"
 	templ "github.com/0xJacky/Nginx-UI/template"

server/service/upgrade.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	_github "github.com/0xJacky/Nginx-UI/.github"
 	"github.com/0xJacky/Nginx-UI/frontend"
-	"github.com/0xJacky/Nginx-UI/logger"
 	"github.com/0xJacky/Nginx-UI/server/internal/helper"
+	"github.com/0xJacky/Nginx-UI/server/internal/logger"
 	"github.com/0xJacky/Nginx-UI/server/settings"
 	"github.com/pkg/errors"
 	"io"