Kaynağa Gözat

revert mutex package change

abhishek9686 1 yıl önce
ebeveyn
işleme
60b52c918a
2 değiştirilmiş dosya ile 3 ekleme ve 6 silme
  1. 1 3
      logic/acls/common.go
  2. 2 3
      logic/acls/nodeacls/retrieve.go

+ 1 - 3
logic/acls/common.go

@@ -4,8 +4,6 @@ import (
 	"encoding/json"
 	"sync"
 
-	"github.com/sasha-s/go-deadlock"
-
 	"github.com/gravitl/netmaker/database"
 	"github.com/gravitl/netmaker/servercfg"
 	"golang.org/x/exp/slog"
@@ -14,7 +12,7 @@ import (
 var (
 	aclCacheMutex = &sync.RWMutex{}
 	aclCacheMap   = make(map[ContainerID]ACLContainer)
-	AclMutex      = &deadlock.RWMutex{}
+	AclMutex      = &sync.RWMutex{}
 )
 
 func fetchAclContainerFromCache(containerID ContainerID) (aclCont ACLContainer, ok bool) {

+ 2 - 3
logic/acls/nodeacls/retrieve.go

@@ -3,13 +3,12 @@ package nodeacls
 import (
 	"encoding/json"
 	"fmt"
-
-	"github.com/sasha-s/go-deadlock"
+	"sync"
 
 	"github.com/gravitl/netmaker/logic/acls"
 )
 
-var NodesAllowedACLMutex = &deadlock.Mutex{}
+var NodesAllowedACLMutex = &sync.Mutex{}
 
 // AreNodesAllowed - checks if nodes are allowed to communicate in their network ACL
 func AreNodesAllowed(networkID NetworkID, node1, node2 NodeID) bool {