gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-09 14:46:36 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3440 from gravitl/master

Browse source 
Master
This commit is contained in:
Abhishek K 2025-04-30 03:02:05 +04:00 • committed by GitHub
commit f9bc3a5386
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/enrollmentkeys.go
View file

@ -302,7 +302,7 @@ func handleHostRegister(w http.ResponseWriter, r *http.Request) {
if !hostExists { if !hostExists {
newHost.PersistentKeepalive = models.DefaultPersistentKeepAlive newHost.PersistentKeepalive = models.DefaultPersistentKeepAlive
// register host // register host
//logic.CheckHostPorts(&newHost) logic.CheckHostPorts(&newHost)
// create EMQX credentials and ACLs for host // create EMQX credentials and ACLs for host
if servercfg.GetBrokerType() == servercfg.EmqxBrokerType { if servercfg.GetBrokerType() == servercfg.EmqxBrokerType {
if err := mq.GetEmqxHandler().CreateEmqxUser(newHost.ID.String(), newHost.HostPass); err != nil { if err := mq.GetEmqxHandler().CreateEmqxUser(newHost.ID.String(), newHost.HostPass); err != nil {

2
controllers/gateway.go
View file

@ -87,6 +87,7 @@ func createGateway(w http.ResponseWriter, r *http.Request) {
"on network", "on network",
req.RelayRequest.NetID, req.RelayRequest.NetID,
) )
logic.GetNodeStatus(&relayNode, false)
apiNode := relayNode.ConvertToAPINode() apiNode := relayNode.ConvertToAPINode()
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
@ -200,6 +201,7 @@ func deleteGateway(w http.ResponseWriter, r *http.Request) {
}() }()
logic.GetNodeStatus(&node, false)
apiNode := node.ConvertToAPINode() apiNode := node.ConvertToAPINode()
logger.Log(1, r.Header.Get("user"), "deleted ingress gateway", nodeid) logger.Log(1, r.Header.Get("user"), "deleted ingress gateway", nodeid)
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)