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

enhance(nginx-log): do not seek file if it size is 0 #674

Browse source
This commit is contained in:
Jacky 2024-11-04 10:54:18 +08:00
parent b552973998
commit cb5c64dec4
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
api/nginx/nginx_log.go
View file

@ -49,7 +49,6 @@ func GetNginxLogPage(c *gin.Context) {
} }
logPath, err := getLogPath(&control) logPath, err := getLogPath(&control)
if err != nil { if err != nil {
c.JSON(http.StatusInternalServerError, nginxLogPageResp{ c.JSON(http.StatusInternalServerError, nginxLogPageResp{
Error: err.Error(), Error: err.Error(),
@ -59,7 +58,6 @@ func GetNginxLogPage(c *gin.Context) {
} }
logFileStat, err := os.Stat(logPath) logFileStat, err := os.Stat(logPath)
if err != nil { if err != nil {
c.JSON(http.StatusInternalServerError, nginxLogPageResp{ c.JSON(http.StatusInternalServerError, nginxLogPageResp{
Error: err.Error(), Error: err.Error(),
@ -76,8 +74,16 @@ func GetNginxLogPage(c *gin.Context) {
return return
} }
f, err := os.Open(logPath) // to fix: seek invalid argument #674
if logFileStat.Size() == 0 {
c.JSON(http.StatusOK, nginxLogPageResp{
Page: 1,
Content: "",
})
return
}
f, err := os.Open(logPath)
if err != nil { if err != nil {
c.JSON(http.StatusInternalServerError, nginxLogPageResp{ c.JSON(http.StatusInternalServerError, nginxLogPageResp{
Error: err.Error(), Error: err.Error(),
@ -112,8 +118,7 @@ func GetNginxLogPage(c *gin.Context) {
} }
n, err := f.Read(buf) n, err := f.Read(buf)
if err != nil && !errors.Is(err, io.EOF) {
if err != nil && err != io.EOF {
c.JSON(http.StatusInternalServerError, nginxLogPageResp{ c.JSON(http.StatusInternalServerError, nginxLogPageResp{
Error: err.Error(), Error: err.Error(),
}) })