zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-30 11:46:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

unexport cache funcs

Browse Source
This commit is contained in:
Abhishek Kondur
2023-06-26 11:18:43 +05:30
parent 4071bb2bac
commit 307203105d
2 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
logic/hosts.go
View File

@@ -22,8 +22,8 @@ import (
)
var (
HostCacheMutex = &sync.RWMutex{}
HostsCacheMap = make(map[string]models.Host)
hostCacheMutex = &sync.RWMutex{}
hostsCacheMap = make(map[string]models.Host)
)
var (
@@ -33,35 +33,35 @@ var (
ErrInvalidHostID error = errors.New("invalid host id")
)
func GetHostsFromCache() (hostsMap map[string]models.Host) {
HostCacheMutex.RLock()
hostsMap = HostsCacheMap
HostCacheMutex.RUnlock()
func getHostsFromCache() (hostsMap map[string]models.Host) {
hostCacheMutex.RLock()
hostsMap = hostsCacheMap
hostCacheMutex.RUnlock()
return
}
func GetHostFromCache(hostID string) (host models.Host, ok bool) {
HostCacheMutex.RLock()
host, ok = HostsCacheMap[hostID]
HostCacheMutex.RUnlock()
func getHostFromCache(hostID string) (host models.Host, ok bool) {
hostCacheMutex.RLock()
host, ok = hostsCacheMap[hostID]
hostCacheMutex.RUnlock()
return
}
func StoreHostInCache(h models.Host) {
HostCacheMutex.Lock()
HostsCacheMap[h.ID.String()] = h
HostCacheMutex.Unlock()
func storeHostInCache(h models.Host) {
hostCacheMutex.Lock()
hostsCacheMap[h.ID.String()] = h
hostCacheMutex.Unlock()
}
func DeleteHostFromCache(hostID string) {
HostCacheMutex.Lock()
delete(HostsCacheMap, hostID)
HostCacheMutex.Unlock()
func deleteHostFromCache(hostID string) {
hostCacheMutex.Lock()
delete(hostsCacheMap, hostID)
hostCacheMutex.Unlock()
}
func LoadHostsIntoCache(hMap map[string]models.Host) {
HostCacheMutex.Lock()
HostsCacheMap = hMap
HostCacheMutex.Unlock()
func loadHostsIntoCache(hMap map[string]models.Host) {
hostCacheMutex.Lock()
hostsCacheMap = hMap
hostCacheMutex.Unlock()
}
const (
@@ -72,7 +72,7 @@ const (
// GetAllHosts - returns all hosts in flat list or error
func GetAllHosts() ([]models.Host, error) {
currHosts := []models.Host{}
hostsMap := GetHostsFromCache()
hostsMap := getHostsFromCache()
if len(hostsMap) != 0 {
for _, host := range hostsMap {
currHosts = append(currHosts, host)
@@ -84,7 +84,7 @@ func GetAllHosts() ([]models.Host, error) {
return nil, err
}
currHostsMap := make(map[string]models.Host)
defer LoadHostsIntoCache(currHostsMap)
defer loadHostsIntoCache(currHostsMap)
for k := range records {
var h models.Host
err = json.Unmarshal([]byte(records[k]), &h)
@@ -110,7 +110,7 @@ func GetAllHostsAPI(hosts []models.Host) []models.ApiHost {
// GetHostsMap - gets all the current hosts on machine in a map
func GetHostsMap() (map[string]models.Host, error) {
hostsMap := GetHostsFromCache()
hostsMap := getHostsFromCache()
if len(hostsMap) != 0 {
return hostsMap, nil
}
@@ -119,7 +119,7 @@ func GetHostsMap() (map[string]models.Host, error) {
return nil, err
}
currHostMap := make(map[string]models.Host)
defer LoadHostsIntoCache(currHostMap)
defer loadHostsIntoCache(currHostMap)
for k := range records {
var h models.Host
err = json.Unmarshal([]byte(records[k]), &h)
@@ -135,7 +135,7 @@ func GetHostsMap() (map[string]models.Host, error) {
// GetHost - gets a host from db given id
func GetHost(hostid string) (*models.Host, error) {
if host, ok := GetHostFromCache(hostid); ok {
if host, ok := getHostFromCache(hostid); ok {
return &host, nil
}
record, err := database.FetchRecord(database.HOSTS_TABLE_NAME, hostid)
@@ -147,7 +147,7 @@ func GetHost(hostid string) (*models.Host, error) {
if err = json.Unmarshal([]byte(record), &h); err != nil {
return nil, err
}
StoreHostInCache(h)
storeHostInCache(h)
return &h, nil
}
@@ -279,7 +279,7 @@ func UpsertHost(h *models.Host) error {
if err != nil {
return err
}
StoreHostInCache(*h)
storeHostInCache(*h)
return nil
}
@@ -295,7 +295,7 @@ func RemoveHost(h *models.Host) error {
if err != nil {
return err
}
DeleteHostFromCache(h.ID.String())
deleteHostFromCache(h.ID.String())
return nil
}
@@ -309,7 +309,7 @@ func RemoveHostByID(hostID string) error {
if err != nil {
return err
}
DeleteHostFromCache(hostID)
deleteHostFromCache(hostID)
return nil
}

68
logic/nodes.go
View File

@@ -23,44 +23,44 @@ import (
)
var (
NodeCacheMutex = &sync.RWMutex{}
NodesCacheMap = make(map[string]models.Node)
nodeCacheMutex = &sync.RWMutex{}
nodesCacheMap = make(map[string]models.Node)
)
func GetNodeFromCache(nodeID string) (node models.Node, ok bool) {
NodeCacheMutex.RLock()
node, ok = NodesCacheMap[nodeID]
NodeCacheMutex.RUnlock()
func getNodeFromCache(nodeID string) (node models.Node, ok bool) {
nodeCacheMutex.RLock()
node, ok = nodesCacheMap[nodeID]
nodeCacheMutex.RUnlock()
return
}
func GetNodesFromCache() (nMap map[string]models.Node) {
NodeCacheMutex.RLock()
nMap = NodesCacheMap
NodeCacheMutex.RUnlock()
func getNodesFromCache() (nMap map[string]models.Node) {
nodeCacheMutex.RLock()
nMap = nodesCacheMap
nodeCacheMutex.RUnlock()
return
}
func DeleteNodeFromCache(nodeID string) {
NodeCacheMutex.Lock()
delete(NodesCacheMap, nodeID)
NodeCacheMutex.Unlock()
func deleteNodeFromCache(nodeID string) {
nodeCacheMutex.Lock()
delete(nodesCacheMap, nodeID)
nodeCacheMutex.Unlock()
}
func StoreNodeInCache(node models.Node) {
NodeCacheMutex.Lock()
NodesCacheMap[node.ID.String()] = node
NodeCacheMutex.Unlock()
func storeNodeInCache(node models.Node) {
nodeCacheMutex.Lock()
nodesCacheMap[node.ID.String()] = node
nodeCacheMutex.Unlock()
}
func LoadNodesIntoCache(nMap map[string]models.Node) {
NodeCacheMutex.Lock()
NodesCacheMap = nMap
NodeCacheMutex.Unlock()
func loadNodesIntoCache(nMap map[string]models.Node) {
nodeCacheMutex.Lock()
nodesCacheMap = nMap
nodeCacheMutex.Unlock()
}
func ClearNodeCache() {
NodeCacheMutex.Lock()
NodesCacheMap = make(map[string]models.Node)
NodeCacheMutex.Unlock()
nodeCacheMutex.Lock()
nodesCacheMap = make(map[string]models.Node)
nodeCacheMutex.Unlock()
}
const (
@@ -117,7 +117,7 @@ func UpdateNodeCheckin(node *models.Node) error {
if err != nil {
return err
}
StoreNodeInCache(*node)
storeNodeInCache(*node)
return nil
}
@@ -132,7 +132,7 @@ func UpsertNode(newNode *models.Node) error {
if err != nil {
return err
}
StoreNodeInCache(*newNode)
storeNodeInCache(*newNode)
return nil
}
@@ -169,7 +169,7 @@ func UpdateNode(currentNode *models.Node, newNode *models.Node) error {
if err != nil {
return err
}
StoreNodeInCache(*newNode)
storeNodeInCache(*newNode)
return nil
}
}
@@ -228,7 +228,7 @@ func deleteNodeByID(node *models.Node) error {
return err
}
}
DeleteNodeFromCache(node.ID.String())
deleteNodeFromCache(node.ID.String())
if servercfg.IsDNSMode() {
SetDNS()
}
@@ -294,7 +294,7 @@ func IsFailoverPresent(network string) bool {
// GetAllNodes - returns all nodes in the DB
func GetAllNodes() ([]models.Node, error) {
var nodes []models.Node
nodesMap := GetNodesFromCache()
nodesMap := getNodesFromCache()
if len(nodesMap) != 0 {
for _, node := range nodesMap {
nodes = append(nodes, node)
@@ -302,7 +302,7 @@ func GetAllNodes() ([]models.Node, error) {
return nodes, nil
}
nodesMap = make(map[string]models.Node)
defer LoadNodesIntoCache(nodesMap)
defer loadNodesIntoCache(nodesMap)
collection, err := database.FetchRecords(database.NODES_TABLE_NAME)
if err != nil {
if database.IsEmptyRecord(err) {
@@ -376,7 +376,7 @@ func GetRecordKey(id string, network string) (string, error) {
}
func GetNodeByID(uuid string) (models.Node, error) {
if node, ok := GetNodeFromCache(uuid); ok {
if node, ok := getNodeFromCache(uuid); ok {
return node, nil
}
var record, err = database.FetchRecord(database.NODES_TABLE_NAME, uuid)
@@ -387,7 +387,7 @@ func GetNodeByID(uuid string) (models.Node, error) {
if err = json.Unmarshal([]byte(record), &node); err != nil {
return models.Node{}, err
}
StoreNodeInCache(node)
storeNodeInCache(node)
return node, nil
}
@@ -537,7 +537,7 @@ func createNode(node *models.Node) error {
if err != nil {
return err
}
StoreNodeInCache(*node)
storeNodeInCache(*node)
_, err = nodeacls.CreateNodeACL(nodeacls.NetworkID(node.Network), nodeacls.NodeID(node.ID.String()), defaultACLVal)
if err != nil {
logger.Log(1, "failed to create node ACL for node,", node.ID.String(), "err:", err.Error())