From b0a8a07ebdd6b1e24fa7ec7eeb9477a2ac743a87 Mon Sep 17 00:00:00 2001 From: Aceix Date: Tue, 29 Apr 2025 22:57:53 +0000 Subject: [PATCH 1/2] fix: add node status in response to create/delete gateway (#3425) --- controllers/gateway.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controllers/gateway.go b/controllers/gateway.go index 4a25f33e..7543a9ac 100644 --- a/controllers/gateway.go +++ b/controllers/gateway.go @@ -87,6 +87,7 @@ func createGateway(w http.ResponseWriter, r *http.Request) { "on network", req.RelayRequest.NetID, ) + logic.GetNodeStatus(&relayNode, false) apiNode := relayNode.ConvertToAPINode() w.WriteHeader(http.StatusOK) @@ -200,6 +201,7 @@ func deleteGateway(w http.ResponseWriter, r *http.Request) { }() + logic.GetNodeStatus(&node, false) apiNode := node.ConvertToAPINode() logger.Log(1, r.Header.Get("user"), "deleted ingress gateway", nodeid) w.WriteHeader(http.StatusOK) From 85084f9dfee3eb7f005b2a1024efe67f3d7ea6c7 Mon Sep 17 00:00:00 2001 From: Abhishek K Date: Wed, 30 Apr 2025 03:00:36 +0400 Subject: [PATCH 2/2] check host ports on join (#3437) --- controllers/enrollmentkeys.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/enrollmentkeys.go b/controllers/enrollmentkeys.go index 1ab9498e..c05bbc92 100644 --- a/controllers/enrollmentkeys.go +++ b/controllers/enrollmentkeys.go @@ -301,7 +301,7 @@ func handleHostRegister(w http.ResponseWriter, r *http.Request) { if !hostExists { newHost.PersistentKeepalive = models.DefaultPersistentKeepAlive // register host - //logic.CheckHostPorts(&newHost) + logic.CheckHostPorts(&newHost) // create EMQX credentials and ACLs for host if servercfg.GetBrokerType() == servercfg.EmqxBrokerType { if err := mq.GetEmqxHandler().CreateEmqxUser(newHost.ID.String(), newHost.HostPass); err != nil {