浏览代码

fix(router): proxy ws routes for environments and nginx detail status #1280

0xJacky 1 周之前
父节点
当前提交
33adfc7c36
共有 3 个文件被更改,包括 10 次插入4 次删除
  1. 4 1
      api/cluster/router.go
  2. 4 3
      api/nginx/router.go
  3. 2 0
      router/routers.go

+ 4 - 1
api/cluster/router.go

@@ -5,7 +5,6 @@ import "github.com/gin-gonic/gin"
 func InitRouter(r *gin.RouterGroup) {
 	// Environment
 	r.GET("environments", GetEnvironmentList)
-	r.GET("environments/enabled", GetAllEnabledEnvironmentWS)
 	r.POST("environments/load_from_settings", LoadEnvironmentFromSettings)
 	envGroup := r.Group("environments")
 	{
@@ -28,3 +27,7 @@ func InitRouter(r *gin.RouterGroup) {
 	r.POST("env_groups/:id/recover", RecoverGroup)
 	r.POST("env_groups/order", UpdateGroupsOrder)
 }
+
+func InitWebSocketRouter(r *gin.RouterGroup) {
+	r.GET("environments/enabled", GetAllEnabledEnvironmentWS)
+}

+ 4 - 3
api/nginx/router.go

@@ -15,9 +15,6 @@ func InitRouter(r *gin.RouterGroup) {
 	r.GET("nginx/status", Status)
 	// Get detailed Nginx status information, including connection count, process information, etc. (Issue #850)
 	r.GET("nginx/detail_status", GetDetailStatus)
-	// Use SSE to push detailed Nginx status information
-	// Use WebSocket to push detailed Nginx status information
-	r.GET("nginx/detail_status/ws", StreamDetailStatusWS)
 	// Get stub_status module status
 	r.GET("nginx/stub_status", CheckStubStatus)
 	// Enable or disable stub_status module
@@ -31,3 +28,7 @@ func InitRouter(r *gin.RouterGroup) {
 
 	r.GET("nginx/modules", GetModules)
 }
+
+func InitWebSocketRouter(r *gin.RouterGroup) {
+	r.GET("nginx/detail_status/ws", StreamDetailStatusWS)
+}

+ 2 - 0
router/routers.go

@@ -102,6 +102,8 @@ func InitRouter() {
 			nginxLog.InitRouter(w)
 			upstream.InitRouter(w)
 			system.InitWebSocketRouter(w)
+			nginx.InitWebSocketRouter(w)
+			cluster.InitWebSocketRouter(w)
 		}
 	}
 }