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

feat: auto detect nginx log path

Browse source
This commit is contained in:
0xJacky 2023-12-06 22:56:52 +08:00
parent f7d9f2564f
commit 179995c4b0
No known key found for this signature in database
GPG key ID: B6E4A6E4A561BAF0
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
api/nginx/nginx_log.go
View file

@ -5,8 +5,7 @@ import (
"github.com/0xJacky/Nginx-UI/api" "github.com/0xJacky/Nginx-UI/api"
"github.com/0xJacky/Nginx-UI/internal/helper" "github.com/0xJacky/Nginx-UI/internal/helper"
"github.com/0xJacky/Nginx-UI/internal/logger" "github.com/0xJacky/Nginx-UI/internal/logger"
nginx2 "github.com/0xJacky/Nginx-UI/internal/nginx" "github.com/0xJacky/Nginx-UI/internal/nginx"
"github.com/0xJacky/Nginx-UI/settings"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/gorilla/websocket" "github.com/gorilla/websocket"
"github.com/hpcloud/tail" "github.com/hpcloud/tail"
@ -107,9 +106,9 @@ func GetNginxLogPage(c *gin.Context) {
func getLogPath(control *controlStruct) (logPath string, err error) { func getLogPath(control *controlStruct) (logPath string, err error) {
switch control.Type { switch control.Type {
case "site": case "site":
var config *nginx2.NgxConfig var config *nginx.NgxConfig
path := nginx2.GetConfPath("sites-available", control.ConfName) path := nginx.GetConfPath("sites-available", control.ConfName)
config, err = nginx2.ParseNgxConfig(path) config, err = nginx.ParseNgxConfig(path)
if err != nil { if err != nil {
err = errors.Wrap(err, "error parsing ngx config") err = errors.Wrap(err, "error parsing ngx config")
return return
@ -142,20 +141,25 @@ func getLogPath(control *controlStruct) (logPath string, err error) {
logPath = directive.Params logPath = directive.Params
case "error": case "error":
if settings.NginxSettings.ErrorLogPath == "" { path := nginx.GetErrorLogPath()
if path == "" {
err = errors.New("settings.NginxLogSettings.ErrorLogPath is empty," + err = errors.New("settings.NginxLogSettings.ErrorLogPath is empty," +
" refer to https://nginxui.com/zh_CN/guide/config-nginx-log.html for more information") " refer to https://nginxui.com/zh_CN/guide/config-nginx-log.html for more information")
return return
} }
logPath = settings.NginxSettings.ErrorLogPath
logPath = path
default: default:
if settings.NginxSettings.AccessLogPath == "" { path := nginx.GetAccessLogPath()
if path == "" {
err = errors.New("settings.NginxLogSettings.AccessLogPath is empty," + err = errors.New("settings.NginxLogSettings.AccessLogPath is empty," +
" refer to https://nginxui.com/zh_CN/guide/config-nginx-log.html for more information") " refer to https://nginxui.com/zh_CN/guide/config-nginx-log.html for more information")
return return
} }
logPath = settings.NginxSettings.AccessLogPath
logPath = path
} }
return return
@ -185,7 +189,7 @@ func tailNginxLog(ws *websocket.Conn, controlChan chan controlStruct, errChan ch
} }
if !helper.FileExists(logPath) { if !helper.FileExists(logPath) {
errChan <- errors.New("error log path not exists") errChan <- errors.New("error log path not exists " + logPath)
return return
} }
@ -254,7 +258,7 @@ func handleLogControl(ws *websocket.Conn, controlChan chan controlStruct, errCha
} }
} }
func NginxLog(c *gin.Context) { func Log(c *gin.Context) {
var upGrader = websocket.Upgrader{ var upGrader = websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool { CheckOrigin: func(r *http.Request) bool {
return true return true