mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-11 18:35:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

enhance: translations

Browse source
This commit is contained in:
Jacky 2025-04-24 22:47:27 +08:00
parent f31407dd7e
commit e8f1321e0c
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
45 changed files with 4009 additions and 2375 deletions
Download patch file Download diff file Expand all files Collapse all files

38
api/nginx_log/nginx_log.go
View file

@ -7,6 +7,7 @@ import (
"strings"
"github.com/0xJacky/Nginx-UI/internal/nginx_log"
"github.com/0xJacky/Nginx-UI/internal/translation"
"github.com/gin-gonic/gin"
"github.com/pkg/errors"
"github.com/spf13/cast"
@ -27,9 +28,9 @@ type controlStruct struct {
// nginxLogPageResp represents the response format for log content
type nginxLogPageResp struct {
Content string `json:"content"` // Log content
Page int64 `json:"page"` // Current page number
Error string `json:"error,omitempty"` // Error message if any
Content string `json:"content"` // Log content
Page int64 `json:"page"` // Current page number
Error *translation.Container `json:"error,omitempty"` // Error message if any
}
// GetNginxLogPage handles retrieving a page of log content from a log file
@ -47,7 +48,7 @@ func GetNginxLogPage(c *gin.Context) {
logPath, err := getLogPath(&control)
if err != nil {
c.JSON(http.StatusInternalServerError, nginxLogPageResp{
Error: err.Error(),
Error: translation.C(err.Error()),
})
logger.Error(err)
return
@ -56,7 +57,7 @@ func GetNginxLogPage(c *gin.Context) {
logFileStat, err := os.Stat(logPath)
if err != nil {
c.JSON(http.StatusInternalServerError, nginxLogPageResp{
Error: err.Error(),
Error: translation.C(err.Error()),
})
logger.Error(err)
return
@ -64,9 +65,14 @@ func GetNginxLogPage(c *gin.Context) {
if !logFileStat.Mode().IsRegular() {
c.JSON(http.StatusInternalServerError, nginxLogPageResp{
Error: "log file is not regular file",
Error: translation.C("Log file %{log_path} is not a regular file. "+
"If you are using nginx-ui in docker container, please refer to "+
"https://nginxui.com/zh_CN/guide/config-nginx-log.html for more information.",
map[string]any{
"log_path": logPath,
}),
})
logger.Errorf("log file is not regular file: %s", logPath)
logger.Errorf("log file is not a regular file: %s", logPath)
return
}
@ -82,7 +88,7 @@ func GetNginxLogPage(c *gin.Context) {
f, err := os.Open(logPath)
if err != nil {
c.JSON(http.StatusInternalServerError, nginxLogPageResp{
Error: err.Error(),
Error: translation.C(err.Error()),
})
logger.Error(err)
return
@ -108,7 +114,7 @@ func GetNginxLogPage(c *gin.Context) {
_, err = f.Seek(offset, io.SeekStart)
if err != nil && err != io.EOF {
c.JSON(http.StatusInternalServerError, nginxLogPageResp{
Error: err.Error(),
Error: translation.C(err.Error()),
})
logger.Error(err)
return
@ -117,7 +123,7 @@ func GetNginxLogPage(c *gin.Context) {
n, err := f.Read(buf)
if err != nil && !errors.Is(err, io.EOF) {
c.JSON(http.StatusInternalServerError, nginxLogPageResp{
Error: err.Error(),
Error: translation.C(err.Error()),
})
logger.Error(err)
return
@ -133,21 +139,21 @@ func GetNginxLogPage(c *gin.Context) {
func GetLogList(c *gin.Context) {
filters := []func(*nginx_log.NginxLogCache) bool{}
if c.Query("type") != "" {
if logType := c.Query("type"); logType != "" {
filters = append(filters, func(entry *nginx_log.NginxLogCache) bool {
return entry.Type == c.Query("type")
return entry.Type == logType
})
}
if c.Query("name") != "" {
if name := c.Query("name"); name != "" {
filters = append(filters, func(entry *nginx_log.NginxLogCache) bool {
return strings.Contains(entry.Name, c.Query("name"))
return strings.Contains(entry.Name, name)
})
}
if c.Query("path") != "" {
if path := c.Query("path"); path != "" {
filters = append(filters, func(entry *nginx_log.NginxLogCache) bool {
return strings.Contains(entry.Path, c.Query("path"))
return strings.Contains(entry.Path, path)
})
}

10
api/nginx_log/websocket.go
View file

@ -5,6 +5,7 @@ import (
"io"
"net/http"
"os"
"runtime"
"github.com/0xJacky/Nginx-UI/internal/helper"
"github.com/0xJacky/Nginx-UI/internal/nginx"
@ -64,6 +65,8 @@ func getLogPath(control *controlStruct) (logPath string, err error) {
func tailNginxLog(ws *websocket.Conn, controlChan chan controlStruct, errChan chan error) {
defer func() {
if err := recover(); err != nil {
buf := make([]byte, 1024)
runtime.Stack(buf, false)
logger.Error(err)
return
}
@ -91,16 +94,13 @@ func tailNginxLog(ws *websocket.Conn, controlChan chan controlStruct, errChan ch
}
if !stat.Mode().IsRegular() {
errChan <- errors.New("[error] " + logPath + " is not a regular file. " +
"If you are using nginx-ui in docker container, please refer to " +
"https://nginxui.com/zh_CN/guide/config-nginx-log.html for more information.")
errChan <- errors.Errorf("[error] %s is not a regular file. If you are using nginx-ui in docker container, please refer to https://nginxui.com/zh_CN/guide/config-nginx-log.html for more information.", logPath)
return
}
// Create a tail
t, err := tail.TailFile(logPath, tail.Config{Follow: true,
ReOpen: true, Location: &seek})
if err != nil {
errChan <- errors.Wrap(err, "error tailing log")
return
@ -137,6 +137,8 @@ func tailNginxLog(ws *websocket.Conn, controlChan chan controlStruct, errChan ch
func handleLogControl(ws *websocket.Conn, controlChan chan controlStruct, errChan chan error) {
defer func() {
if err := recover(); err != nil {
buf := make([]byte, 1024)
runtime.Stack(buf, false)
logger.Error(err)
return
}