Bugfix/correlation/minor bugfixes (#696)

* ensure smooth cache cleanup and mutex release

* sleep for the rule sleep time

* fixing identation

* updating standard rules each 48 hours

Author: osmontero

correlation/cache/cache.go

@@ -32,6 +32,8 @@ func Status() {
 func Search(allOf []rules.AllOf, oneOf []rules.OneOf, seconds int64) []string {
 	var elements []string
 	cacheStorageMutex.RLock()
+	defer cacheStorageMutex.RUnlock()
+
 	cToBreak := 0
 	ait := time.Now().UTC().Unix() - func() int64 {
 		switch seconds {
@@ -75,7 +77,7 @@ func Search(allOf []rules.AllOf, oneOf []rules.OneOf, seconds int64) []string {
 			}
 		}
 	}
-	cacheStorageMutex.RUnlock()
+	
 	return elements
 }
 
@@ -107,7 +109,7 @@ func Clean() {
 	for {
 		var clean bool
 
-		if len(CacheStorage) > 500 {
+		if len(CacheStorage) > 1 {
 			if utils.AssignedMemory >= 80 {
 				clean = true
 			} else {
@@ -128,7 +130,7 @@ func Clean() {
 
 		if clean {
 			cacheStorageMutex.Lock()
-			CacheStorage = CacheStorage[500:]
+			CacheStorage = CacheStorage[1:]
 			cacheStorageMutex.Unlock()
 		} else {
 			time.Sleep(5 * time.Second)

correlation/correlation/finder.go

@@ -48,7 +48,7 @@ func Finder(rule rules.Rule) {
 		}
 
 		if !execute {
-			time.Sleep(1 * time.Minute)
+			time.Sleep(sleep)
 			continue
 		}
 

correlation/rules/rules.go

@@ -51,7 +51,7 @@ type OneOf struct {
 type Cache struct {
 	AllOf     []AllOf      `yaml:"allOf"`
 	OneOf     []OneOf      `yaml:"oneOf"`
-	TimeLapse int64          `yaml:"timeLapse"`
+	TimeLapse int64        `yaml:"timeLapse"`
 	MinCount  int          `yaml:"minCount"`
 	Save      []SavedField `yaml:"save"`
 }

correlation/rules/update.go

@@ -26,7 +26,7 @@ func Update(updateReady chan bool) {
 		}
 
 		log.Println("Rules updated")
-		time.Sleep(24 * time.Hour)
+		time.Sleep(48 * time.Hour)
 	}
 }