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

fix: visits no exists log causing high CPU load

Browse source 
Closes #108
This commit is contained in:
0xJacky 2023-05-01 10:36:34 +08:00
parent fda04b9576
commit 2c675be774
No known key found for this signature in database
GPG key ID: B6E4A6E4A561BAF0
1 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

27
server/api/nginx_log.go
View file

@ -2,6 +2,7 @@ package api
import ( import (
"encoding/json" "encoding/json"
"github.com/0xJacky/Nginx-UI/server/pkg/helper"
"github.com/0xJacky/Nginx-UI/server/pkg/nginx" "github.com/0xJacky/Nginx-UI/server/pkg/nginx"
"github.com/0xJacky/Nginx-UI/server/settings" "github.com/0xJacky/Nginx-UI/server/settings"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
@ -163,11 +164,6 @@ func tailNginxLog(ws *websocket.Conn, controlChan chan controlStruct, errChan ch
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
log.Println("tailNginxLog recovery", err) log.Println("tailNginxLog recovery", err)
err = ws.WriteMessage(websocket.TextMessage, err.([]byte))
if err != nil {
log.Println(err)
return
}
return return
} }
}() }()
@ -187,12 +183,17 @@ func tailNginxLog(ws *websocket.Conn, controlChan chan controlStruct, errChan ch
Whence: io.SeekEnd, Whence: io.SeekEnd,
} }
if !helper.FileExists(logPath) {
errChan <- errors.New("error log path not exists")
return
}
// Create a tail // Create a tail
t, err := tail.TailFile(logPath, tail.Config{Follow: true, t, err := tail.TailFile(logPath, tail.Config{Follow: true,
ReOpen: true, Location: &seek}) ReOpen: true, Location: &seek})
if err != nil { if err != nil {
errChan <- errors.Wrap(err, "error NginxAccessLog Tail") errChan <- errors.Wrap(err, "error tailing log")
return return
} }
@ -208,7 +209,7 @@ func tailNginxLog(ws *websocket.Conn, controlChan chan controlStruct, errChan ch
err = ws.WriteMessage(websocket.TextMessage, []byte(line.Text)) err = ws.WriteMessage(websocket.TextMessage, []byte(line.Text))
if err != nil && websocket.IsUnexpectedCloseError(err, websocket.CloseNormalClosure) { if err != nil && websocket.IsUnexpectedCloseError(err, websocket.CloseNormalClosure) {
errChan <- errors.Wrap(err, "error NginxAccessLog write message") errChan <- errors.Wrap(err, "error tailNginxLog write message")
return return
} }
case control = <-controlChan: case control = <-controlChan:
@ -225,27 +226,27 @@ func tailNginxLog(ws *websocket.Conn, controlChan chan controlStruct, errChan ch
func handleLogControl(ws *websocket.Conn, controlChan chan controlStruct, errChan chan error) { func handleLogControl(ws *websocket.Conn, controlChan chan controlStruct, errChan chan error) {
defer func() { defer func() {
if err := recover(); err != nil { if err := recover(); err != nil {
log.Println("tailNginxLog recovery", err) log.Println("handleLogControl recovery", err)
return return
} }
}() }()
for { for {
msgType, payload, err := ws.ReadMessage() msgType, payload, err := ws.ReadMessage()
if err != nil { if err != nil && websocket.IsUnexpectedCloseError(err, websocket.CloseNormalClosure) {
errChan <- errors.Wrap(err, "error NginxAccessLog read message") errChan <- errors.Wrap(err, "error handleLogControl read message")
return return
} }
if msgType != websocket.TextMessage { if msgType != websocket.TextMessage {
errChan <- errors.New("error NginxAccessLog message type") errChan <- errors.New("error handleLogControl message type")
return return
} }
var msg controlStruct var msg controlStruct
err = json.Unmarshal(payload, &msg) err = json.Unmarshal(payload, &msg)
if err != nil { if err != nil {
errChan <- errors.Wrap(err, "Error ReadWsAndWritePty json.Unmarshal") errChan <- errors.Wrap(err, "error ReadWsAndWritePty json.Unmarshal")
return return
} }
controlChan <- msg controlChan <- msg
@ -261,7 +262,7 @@ func NginxLog(c *gin.Context) {
// upgrade http to websocket // upgrade http to websocket
ws, err := upGrader.Upgrade(c.Writer, c.Request, nil) ws, err := upGrader.Upgrade(c.Writer, c.Request, nil)
if err != nil { if err != nil {
log.Println("[Error] NginxAccessLog Upgrade", err) log.Println("[Error] NginxLog Upgrade", err)
return return
} }