abhishek9686 7 miesięcy temu
rodzic
commit
e1233a3ef7
1 zmienionych plików z 3 dodań i 5 usunięć
  1. 3 5
      logic/acls.go

+ 3 - 5
logic/acls.go

@@ -412,10 +412,6 @@ func DeleteAcl(a models.Acl) error {
 
 // GetDefaultPolicy - fetches default policy in the network by ruleType
 func GetDefaultPolicy(netID models.NetworkID, ruleType models.AclPolicyType) (models.Acl, error) {
-	defaultPolicy := getDefaultPolicyFromNetCache(netID, ruleType)
-	if defaultPolicy.ID != "" {
-		return defaultPolicy, nil
-	}
 	aclID := "all-users"
 	if ruleType == models.DevicePolicy {
 		aclID = "all-nodes"
@@ -546,14 +542,16 @@ func getDefaultPolicyFromNetCache(netID models.NetworkID, ruleType models.AclPol
 
 func listPolicesFromNetCache(netID models.NetworkID, ruleType models.AclPolicyType) []models.Acl {
 	aclNetCacheMutex.RLock()
-	defer aclNetCacheMutex.RUnlock()
 	if aclNetInfo, ok := aclNetworkCacheMap[netID]; ok {
 		if ruleType == models.DevicePolicy {
+			aclNetCacheMutex.RUnlock()
 			return aclNetInfo.DevicePolices
 		} else {
+			aclNetCacheMutex.RUnlock()
 			return aclNetInfo.UserPolicies
 		}
 	}
+	aclNetCacheMutex.RUnlock()
 	if ruleType == models.DevicePolicy {
 		return listDevicePolicies(netID)
 	}