Bläddra i källkod

add failover info to api node

Abhishek Kondur 1 år sedan
förälder
incheckning
9101f73dd4
3 ändrade filer med 8 tillägg och 4 borttagningar
  1. 6 2
      models/api_node.go
  2. 1 1
      pro/controllers/failover.go
  3. 1 1
      pro/logic/relays.go

+ 6 - 2
models/api_node.go

@@ -37,8 +37,10 @@ type ApiNode struct {
 	Connected               bool     `json:"connected"`
 	PendingDelete           bool     `json:"pendingdelete"`
 	// == PRO ==
-	DefaultACL string `json:"defaultacl,omitempty" validate:"checkyesornoorunset"`
-	IsFailOver bool   `json:"is_fail_over" `
+	DefaultACL    string              `json:"defaultacl,omitempty" validate:"checkyesornoorunset"`
+	IsFailOver    bool                `json:"is_fail_over"`
+	FailOverPeers map[string]struct{} `json:"fail_over_peers" yaml:"fail_over_peers"`
+	FailedOverBy  uuid.UUID           `json:"failed_over_by" yaml:"failed_over_by"`
 }
 
 // ApiNode.ConvertToServerNode - converts an api node to a server node
@@ -156,6 +158,8 @@ func (nm *Node) ConvertToAPINode() *ApiNode {
 	apiNode.PendingDelete = nm.PendingDelete
 	apiNode.DefaultACL = nm.DefaultACL
 	apiNode.IsFailOver = nm.IsFailOver
+	apiNode.FailOverPeers = nm.FailOverPeers
+	apiNode.FailedOverBy = nm.FailedOverBy
 	return &apiNode
 }
 

+ 1 - 1
pro/controllers/failover.go

@@ -94,7 +94,7 @@ func deletefailOver(w http.ResponseWriter, r *http.Request) {
 		mq.PublishPeerUpdate()
 	}()
 	w.Header().Set("Content-Type", "application/json")
-	logic.ReturnSuccessResponseWithJson(w, r, node, "created failover successfully")
+	logic.ReturnSuccessResponseWithJson(w, r, node, "deleted failover successfully")
 }
 
 // swagger:route POST /api/node/{nodeid}/failOverME node failOver_me

+ 1 - 1
pro/logic/relays.go

@@ -69,7 +69,7 @@ func SetRelayedNodes(setRelayed bool, relay string, relayed []string) []models.N
 			continue
 		}
 		node.IsRelayed = setRelayed
-		if node.IsRelayed {
+		if setRelayed {
 			node.RelayedBy = relay
 		} else {
 			node.RelayedBy = ""