Skip to content

Commit 33adfc7

Browse files
committed
fix(router): proxy ws routes for environments and nginx detail status #1280
1 parent cd05303 commit 33adfc7

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

api/cluster/router.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import "github.com/gin-gonic/gin"
55
func InitRouter(r *gin.RouterGroup) {
66
// Environment
77
r.GET("environments", GetEnvironmentList)
8-
r.GET("environments/enabled", GetAllEnabledEnvironmentWS)
98
r.POST("environments/load_from_settings", LoadEnvironmentFromSettings)
109
envGroup := r.Group("environments")
1110
{
@@ -28,3 +27,7 @@ func InitRouter(r *gin.RouterGroup) {
2827
r.POST("env_groups/:id/recover", RecoverGroup)
2928
r.POST("env_groups/order", UpdateGroupsOrder)
3029
}
30+
31+
func InitWebSocketRouter(r *gin.RouterGroup) {
32+
r.GET("environments/enabled", GetAllEnabledEnvironmentWS)
33+
}

api/nginx/router.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ func InitRouter(r *gin.RouterGroup) {
1515
r.GET("nginx/status", Status)
1616
// Get detailed Nginx status information, including connection count, process information, etc. (Issue #850)
1717
r.GET("nginx/detail_status", GetDetailStatus)
18-
// Use SSE to push detailed Nginx status information
19-
// Use WebSocket to push detailed Nginx status information
20-
r.GET("nginx/detail_status/ws", StreamDetailStatusWS)
2118
// Get stub_status module status
2219
r.GET("nginx/stub_status", CheckStubStatus)
2320
// Enable or disable stub_status module
@@ -31,3 +28,7 @@ func InitRouter(r *gin.RouterGroup) {
3128

3229
r.GET("nginx/modules", GetModules)
3330
}
31+
32+
func InitWebSocketRouter(r *gin.RouterGroup) {
33+
r.GET("nginx/detail_status/ws", StreamDetailStatusWS)
34+
}

router/routers.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ func InitRouter() {
102102
nginxLog.InitRouter(w)
103103
upstream.InitRouter(w)
104104
system.InitWebSocketRouter(w)
105+
nginx.InitWebSocketRouter(w)
106+
cluster.InitWebSocketRouter(w)
105107
}
106108
}
107109
}

0 commit comments

Comments
 (0)