gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-02-26 00:53:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

add logging to check for node publish

Browse source
This commit is contained in:
afeiszli 2022-02-01 11:31:19 -05:00
parent bee8492c7a
commit 8c0341391c
3 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
controllers/relay.go
View file

@ -8,7 +8,6 @@ import (
"github.com/gravitl/netmaker/logger" "github.com/gravitl/netmaker/logger"
"github.com/gravitl/netmaker/logic" "github.com/gravitl/netmaker/logic"
"github.com/gravitl/netmaker/models" "github.com/gravitl/netmaker/models"
"github.com/gravitl/netmaker/mq"
) )
func createRelay(w http.ResponseWriter, r *http.Request) { func createRelay(w http.ResponseWriter, r *http.Request) {
@ -27,17 +26,10 @@ func createRelay(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 {
logger.Log(1, "error publishing node update", err.Error())
}
if err = runServerPeerUpdate(&node, isServer(&node)); err != nil {
logger.Log(1, "internal error when creating relay on node:", relay.NodeID)
}
logger.Log(1, r.Header.Get("user"), "created relay on node", relay.NodeID, "on network", relay.NetID) logger.Log(1, r.Header.Get("user"), "created relay on node", relay.NodeID, "on network", relay.NetID)
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(node) json.NewEncoder(w).Encode(node)
runUpdates(&node, true)
} }
func deleteRelay(w http.ResponseWriter, r *http.Request) { func deleteRelay(w http.ResponseWriter, r *http.Request) {
@ -50,18 +42,8 @@ func deleteRelay(w http.ResponseWriter, r *http.Request) {
returnErrorResponse(w, r, formatError(err, "internal")) returnErrorResponse(w, r, formatError(err, "internal"))
return return
} }
if err = runServerPeerUpdate(&node, isServer(&node)); err != nil {
logger.Log(1, "internal error when deleting relay on node:", nodeid)
}
go func() {
if err := mq.NodeUpdate(&node); err != nil {
logger.Log(1, "error publishing node update", err.Error())
}
if err := mq.PublishPeerUpdate(&node); err != nil {
logger.Log(1, "error publishing peer update ", err.Error())
}
}()
logger.Log(1, r.Header.Get("user"), "deleted relay server", nodeid, "on network", netid) logger.Log(1, r.Header.Get("user"), "deleted relay server", nodeid, "on network", netid)
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
json.NewEncoder(w).Encode(node) json.NewEncoder(w).Encode(node)
runUpdates(&node, true)
} }

2
mq/mq.go
View file

@ -108,8 +108,10 @@ func PublishPeerUpdate(newNode *models.Node) error {
for _, node := range networkNodes { for _, node := range networkNodes {
if node.IsServer == "yes" || node.ID == newNode.ID { if node.IsServer == "yes" || node.ID == newNode.ID {
log.Println("skipping update on " + node.Name + " : " + node.ID)
continue continue
} }
log.Println("running update on " + node.Name + " : " + node.ID)
peerUpdate, err := logic.GetPeerUpdate(&node) peerUpdate, err := logic.GetPeerUpdate(&node)
if err != nil { if err != nil {
logger.Log(1, "error getting peer update for node", node.ID, err.Error()) logger.Log(1, "error getting peer update for node", node.ID, err.Error())

2
netclient/functions/join.go
View file

@ -125,6 +125,8 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
// differentiate between client/server here // differentiate between client/server here
var node = models.Node{ var node = models.Node{
Password: cfg.Node.Password, Password: cfg.Node.Password,
Address: cfg.Node.Address,
Address6: cfg.Node.Address6,
ID: cfg.Node.ID, ID: cfg.Node.ID,
MacAddress: cfg.Node.MacAddress, MacAddress: cfg.Node.MacAddress,
AccessKey: cfg.Server.AccessKey, AccessKey: cfg.Server.AccessKey,