zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-05 16:57:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

publish Node and Peer updates in go routine to ensure UI responses are not delayed

Browse Source
This commit is contained in:
Matthew R Kasun
2022-01-24 13:56:10 -05:00
parent f54d0fd993
commit d722218f32
1 changed files with 59 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
controllers/node.go
View File

@@ -420,13 +420,15 @@ func uncordonNode(w http.ResponseWriter, r *http.Request) {
returnErrorResponse(w, r, formatError(err, "internal")) returnErrorResponse(w, r, formatError(err, "internal"))
return return
} }
if err := mq.NodeUpdate(&node); err != nil { go func() {
logger.Log(1, "error publishing node update"+err.Error()) if err := mq.NodeUpdate(&node); err != nil {
} logger.Log(1, "error publishing node update"+err.Error())
if err := mq.UpdatePeers(&node); err != nil { }
logger.Log(1, "error publishing peer update "+err.Error()) if err := mq.UpdatePeers(&node); err != nil {
return logger.Log(1, "error publishing peer update "+err.Error())
} return
}
}()
logger.Log(1, r.Header.Get("user"), "uncordoned node", node.Name) logger.Log(1, r.Header.Get("user"), "uncordoned node", node.Name)
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode("SUCCESS") json.NewEncoder(w).Encode("SUCCESS")
@@ -448,13 +450,15 @@ func createEgressGateway(w http.ResponseWriter, r *http.Request) {
returnErrorResponse(w, r, formatError(err, "internal")) returnErrorResponse(w, r, formatError(err, "internal"))
return return
} }
if err := mq.NodeUpdate(&node); err != nil { go func() {
logger.Log(1, "error publishing node update"+err.Error()) if err := mq.NodeUpdate(&node); err != nil {
} logger.Log(1, "error publishing node update"+err.Error())
if err := mq.UpdatePeers(&node); err != nil { }
logger.Log(1, "error publishing peer update "+err.Error()) if err := mq.UpdatePeers(&node); err != nil {
return logger.Log(1, "error publishing peer update "+err.Error())
} return
}
}()
logger.Log(1, r.Header.Get("user"), "created egress gateway on node", gateway.NodeID, "on network", gateway.NetID) logger.Log(1, r.Header.Get("user"), "created egress gateway on node", gateway.NodeID, "on network", gateway.NetID)
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(node) json.NewEncoder(w).Encode(node)
@@ -470,13 +474,15 @@ func deleteEgressGateway(w http.ResponseWriter, r *http.Request) {
returnErrorResponse(w, r, formatError(err, "internal")) returnErrorResponse(w, r, formatError(err, "internal"))
return return
} }
if err := mq.NodeUpdate(&node); err != nil { go func() {
logger.Log(1, "error publishing node update"+err.Error()) if err := mq.NodeUpdate(&node); err != nil {
} logger.Log(1, "error publishing node update"+err.Error())
if err := mq.UpdatePeers(&node); err != nil { }
logger.Log(1, "error publishing peer update "+err.Error()) if err := mq.UpdatePeers(&node); err != nil {
return logger.Log(1, "error publishing peer update "+err.Error())
} return
}
}()
logger.Log(1, r.Header.Get("user"), "deleted egress gateway", nodeid, "on network", netid) logger.Log(1, r.Header.Get("user"), "deleted egress gateway", nodeid, "on network", netid)
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(node) json.NewEncoder(w).Encode(node)
@@ -494,13 +500,15 @@ func createIngressGateway(w http.ResponseWriter, r *http.Request) {
returnErrorResponse(w, r, formatError(err, "internal")) returnErrorResponse(w, r, formatError(err, "internal"))
return return
} }
if err := mq.NodeUpdate(&node); err != nil { go func() {
logger.Log(1, "error publishing node update"+err.Error()) if err := mq.NodeUpdate(&node); err != nil {
} logger.Log(1, "error publishing node update"+err.Error())
if err := mq.UpdatePeers(&node); err != nil { }
logger.Log(1, "error publishing peer update "+err.Error()) if err := mq.UpdatePeers(&node); err != nil {
return logger.Log(1, "error publishing peer update "+err.Error())
} return
}
}()
logger.Log(1, r.Header.Get("user"), "created ingress gateway on node", nodeid, "on network", netid) logger.Log(1, r.Header.Get("user"), "created ingress gateway on node", nodeid, "on network", netid)
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(node) json.NewEncoder(w).Encode(node)
@@ -515,13 +523,15 @@ func deleteIngressGateway(w http.ResponseWriter, r *http.Request) {
returnErrorResponse(w, r, formatError(err, "internal")) returnErrorResponse(w, r, formatError(err, "internal"))
return return
} }
if err := mq.NodeUpdate(&node); err != nil { go func() {
logger.Log(1, "error publishing node update"+err.Error()) if err := mq.NodeUpdate(&node); err != nil {
} logger.Log(1, "error publishing node update"+err.Error())
if err := mq.UpdatePeers(&node); err != nil { }
logger.Log(1, "error publishing peer update "+err.Error()) if err := mq.UpdatePeers(&node); err != nil {
return logger.Log(1, "error publishing peer update "+err.Error())
} return
}
}()
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)
json.NewEncoder(w).Encode(node) json.NewEncoder(w).Encode(node)
@@ -588,14 +598,16 @@ func updateNode(w http.ResponseWriter, r *http.Request) {
logger.Log(1, r.Header.Get("user"), "updated node", node.MacAddress, "on network", node.Network) logger.Log(1, r.Header.Get("user"), "updated node", node.MacAddress, "on network", node.Network)
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(newNode) json.NewEncoder(w).Encode(newNode)
if err := mq.NodeUpdate(&newNode); err != nil { go func() {
logger.Log(1, "error publishing node update"+err.Error()) if err := mq.NodeUpdate(&newNode); err != nil {
} logger.Log(1, "error publishing node update"+err.Error())
if logic.ShouldPeersUpdate(&node, &newNode) {
if err := mq.UpdatePeers(&newNode); err != nil {
logger.Log(1, "error publishing peer update after node update"+err.Error())
} }
} if logic.ShouldPeersUpdate(&node, &newNode) {
if err := mq.UpdatePeers(&newNode); err != nil {
logger.Log(1, "error publishing peer update after node update"+err.Error())
}
}
}()
} }
func deleteNode(w http.ResponseWriter, r *http.Request) { func deleteNode(w http.ResponseWriter, r *http.Request) {
@@ -616,9 +628,11 @@ func deleteNode(w http.ResponseWriter, r *http.Request) {
return return
} }
node.Action = models.NODE_DELETE node.Action = models.NODE_DELETE
if err := mq.NodeUpdate(&node); err != nil { go func() {
logger.Log(1, "error publishing node delete "+err.Error()) if err := mq.NodeUpdate(&node); err != nil {
} logger.Log(1, "error publishing node delete "+err.Error())
}
}()
logger.Log(1, r.Header.Get("user"), "Deleted node", nodeid, "from network", params["network"]) logger.Log(1, r.Header.Get("user"), "Deleted node", nodeid, "from network", params["network"])
returnSuccessResponse(w, r, nodeid+" deleted.") returnSuccessResponse(w, r, nodeid+" deleted.")
} }