|
@@ -119,7 +119,9 @@ func UpdateNodeCheckin(node *models.Node) error {
|
|
if err != nil {
|
|
if err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
- storeNodeInCache(*node)
|
|
|
|
|
|
+ if servercfg.CacheEnabled() {
|
|
|
|
+ storeNodeInCache(*node)
|
|
|
|
+ }
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
|
|
@@ -134,7 +136,9 @@ func UpsertNode(newNode *models.Node) error {
|
|
if err != nil {
|
|
if err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
- storeNodeInCache(*newNode)
|
|
|
|
|
|
+ if servercfg.CacheEnabled() {
|
|
|
|
+ storeNodeInCache(*newNode)
|
|
|
|
+ }
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
|
|
|
|
@@ -171,7 +175,9 @@ func UpdateNode(currentNode *models.Node, newNode *models.Node) error {
|
|
if err != nil {
|
|
if err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
- storeNodeInCache(*newNode)
|
|
|
|
|
|
+ if servercfg.CacheEnabled() {
|
|
|
|
+ storeNodeInCache(*newNode)
|
|
|
|
+ }
|
|
return nil
|
|
return nil
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -266,7 +272,9 @@ func DeleteNodeByID(node *models.Node) error {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- deleteNodeFromCache(node.ID.String())
|
|
|
|
|
|
+ if servercfg.CacheEnabled() {
|
|
|
|
+ deleteNodeFromCache(node.ID.String())
|
|
|
|
+ }
|
|
if servercfg.IsDNSMode() {
|
|
if servercfg.IsDNSMode() {
|
|
SetDNS()
|
|
SetDNS()
|
|
}
|
|
}
|
|
@@ -326,12 +334,16 @@ func IsFailoverPresent(network string) bool {
|
|
// GetAllNodes - returns all nodes in the DB
|
|
// GetAllNodes - returns all nodes in the DB
|
|
func GetAllNodes() ([]models.Node, error) {
|
|
func GetAllNodes() ([]models.Node, error) {
|
|
var nodes []models.Node
|
|
var nodes []models.Node
|
|
- nodes = getNodesFromCache()
|
|
|
|
- if len(nodes) != 0 {
|
|
|
|
- return nodes, nil
|
|
|
|
|
|
+ if servercfg.CacheEnabled() {
|
|
|
|
+ nodes = getNodesFromCache()
|
|
|
|
+ if len(nodes) != 0 {
|
|
|
|
+ return nodes, nil
|
|
|
|
+ }
|
|
}
|
|
}
|
|
nodesMap := make(map[string]models.Node)
|
|
nodesMap := make(map[string]models.Node)
|
|
- defer loadNodesIntoCache(nodesMap)
|
|
|
|
|
|
+ if servercfg.CacheEnabled() {
|
|
|
|
+ defer loadNodesIntoCache(nodesMap)
|
|
|
|
+ }
|
|
collection, err := database.FetchRecords(database.NODES_TABLE_NAME)
|
|
collection, err := database.FetchRecords(database.NODES_TABLE_NAME)
|
|
if err != nil {
|
|
if err != nil {
|
|
if database.IsEmptyRecord(err) {
|
|
if database.IsEmptyRecord(err) {
|
|
@@ -402,8 +414,10 @@ func GetRecordKey(id string, network string) (string, error) {
|
|
}
|
|
}
|
|
|
|
|
|
func GetNodeByID(uuid string) (models.Node, error) {
|
|
func GetNodeByID(uuid string) (models.Node, error) {
|
|
- if node, ok := getNodeFromCache(uuid); ok {
|
|
|
|
- return node, nil
|
|
|
|
|
|
+ if servercfg.CacheEnabled() {
|
|
|
|
+ if node, ok := getNodeFromCache(uuid); ok {
|
|
|
|
+ return node, nil
|
|
|
|
+ }
|
|
}
|
|
}
|
|
var record, err = database.FetchRecord(database.NODES_TABLE_NAME, uuid)
|
|
var record, err = database.FetchRecord(database.NODES_TABLE_NAME, uuid)
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -413,7 +427,9 @@ func GetNodeByID(uuid string) (models.Node, error) {
|
|
if err = json.Unmarshal([]byte(record), &node); err != nil {
|
|
if err = json.Unmarshal([]byte(record), &node); err != nil {
|
|
return models.Node{}, err
|
|
return models.Node{}, err
|
|
}
|
|
}
|
|
- storeNodeInCache(node)
|
|
|
|
|
|
+ if servercfg.CacheEnabled() {
|
|
|
|
+ storeNodeInCache(node)
|
|
|
|
+ }
|
|
return node, nil
|
|
return node, nil
|
|
}
|
|
}
|
|
|
|
|
|
@@ -569,7 +585,9 @@ func createNode(node *models.Node) error {
|
|
if err != nil {
|
|
if err != nil {
|
|
return err
|
|
return err
|
|
}
|
|
}
|
|
- storeNodeInCache(*node)
|
|
|
|
|
|
+ if servercfg.CacheEnabled() {
|
|
|
|
+ storeNodeInCache(*node)
|
|
|
|
+ }
|
|
_, err = nodeacls.CreateNodeACL(nodeacls.NetworkID(node.Network), nodeacls.NodeID(node.ID.String()), defaultACLVal)
|
|
_, err = nodeacls.CreateNodeACL(nodeacls.NetworkID(node.Network), nodeacls.NodeID(node.ID.String()), defaultACLVal)
|
|
if err != nil {
|
|
if err != nil {
|
|
logger.Log(1, "failed to create node ACL for node,", node.ID.String(), "err:", err.Error())
|
|
logger.Log(1, "failed to create node ACL for node,", node.ID.String(), "err:", err.Error())
|