fix(docker): nginx restart always output network error

api/nginx/control.go

@@ -4,6 +4,7 @@ import (
 	"github.com/0xJacky/Nginx-UI/internal/nginx"
 	"github.com/gin-gonic/gin"
 	"net/http"
+	"os"
 )
 
 func Reload(c *gin.Context) {
@@ -23,9 +24,24 @@ func Test(c *gin.Context) {
 }
 
 func Restart(c *gin.Context) {
-	output := nginx.Restart()
 	c.JSON(http.StatusOK, gin.H{
-		"message": output,
-		"level":   nginx.GetLogLevel(output),
+		"message": "ok",
+	})
+	go nginx.Restart()
+}
+
+func Status(c *gin.Context) {
+	pidPath := nginx.GetPIDPath()
+	lastOutput := nginx.GetLastOutput()
+
+	running := true
+	if fileInfo, err := os.Stat(pidPath); err != nil || fileInfo.Size() == 0 { // fileInfo.Size() == 0 no process id
+		running = false
+	}
+
+	c.JSON(http.StatusOK, gin.H{
+		"running": running,
+		"message": lastOutput,
+		"level":   nginx.GetLogLevel(lastOutput),
 	})
 }

api/nginx/nginx.go

@@ -1,73 +1,59 @@
 package nginx
 
 import (
-	"github.com/0xJacky/Nginx-UI/api"
-	"github.com/0xJacky/Nginx-UI/internal/nginx"
-	"github.com/gin-gonic/gin"
-	"net/http"
-	"os"
+    "github.com/0xJacky/Nginx-UI/api"
+    "github.com/0xJacky/Nginx-UI/internal/nginx"
+    "github.com/gin-gonic/gin"
+    "net/http"
 )
 
 func BuildNginxConfig(c *gin.Context) {
-	var ngxConf nginx.NgxConfig
-	if !api.BindAndValid(c, &ngxConf) {
-		return
-	}
-	content, err := ngxConf.BuildConfig()
-	if err != nil {
-		api.ErrHandler(c, err)
-		return
-	}
-	c.JSON(http.StatusOK, gin.H{
-		"content": content,
-	})
+    var ngxConf nginx.NgxConfig
+    if !api.BindAndValid(c, &ngxConf) {
+        return
+    }
+    content, err := ngxConf.BuildConfig()
+    if err != nil {
+        api.ErrHandler(c, err)
+        return
+    }
+    c.JSON(http.StatusOK, gin.H{
+        "content": content,
+    })
 }
 
 func TokenizeNginxConfig(c *gin.Context) {
-	var json struct {
-		Content string `json:"content" binding:"required"`
-	}
+    var json struct {
+        Content string `json:"content" binding:"required"`
+    }
 
-	if !api.BindAndValid(c, &json) {
-		return
-	}
+    if !api.BindAndValid(c, &json) {
+        return
+    }
 
-	ngxConfig, err := nginx.ParseNgxConfigByContent(json.Content)
-	if err != nil {
-		api.ErrHandler(c, err)
-		return
-	}
-	c.JSON(http.StatusOK, ngxConfig)
+    ngxConfig, err := nginx.ParseNgxConfigByContent(json.Content)
+    if err != nil {
+        api.ErrHandler(c, err)
+        return
+    }
+    c.JSON(http.StatusOK, ngxConfig)
 
 }
 
 func FormatNginxConfig(c *gin.Context) {
-	var json struct {
-		Content string `json:"content" binding:"required"`
-	}
+    var json struct {
+        Content string `json:"content" binding:"required"`
+    }
 
-	if !api.BindAndValid(c, &json) {
-		return
-	}
-	content, err := nginx.FmtCode(json.Content)
-	if err != nil {
-		api.ErrHandler(c, err)
-		return
-	}
-	c.JSON(http.StatusOK, gin.H{
-		"content": content,
-	})
-}
-
-func Status(c *gin.Context) {
-	pidPath := nginx.GetPIDPath()
-
-	running := true
-	if fileInfo, err := os.Stat(pidPath); err != nil || fileInfo.Size() == 0 { // fileInfo.Size() == 0 no process id
-		running = false
-	}
-
-	c.JSON(http.StatusOK, gin.H{
-		"running": running,
-	})
+    if !api.BindAndValid(c, &json) {
+        return
+    }
+    content, err := nginx.FmtCode(json.Content)
+    if err != nil {
+        api.ErrHandler(c, err)
+        return
+    }
+    c.JSON(http.StatusOK, gin.H{
+        "content": content,
+    })
 }