Merge pull request kubearmor#624 from nyrahul/main

feeder: solved deadlock issue with telemetry
daemon1024 · Feb 16, 2022 · 975ab49 · 975ab49
2 parents bf39613 + 2a27439
commit 975ab49
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/KubeArmor/feeder/feeder.go b/KubeArmor/feeder/feeder.go
@@ -242,7 +242,7 @@ func (ls *LogService) WatchLogs(req *pb.RequestMessage, svr pb.LogService_WatchL
 				case codes.OK:
 					// noop
 				case codes.Unavailable, codes.Canceled, codes.DeadlineExceeded:
-					kg.Warnf("Failed to send a log=[%+v] err=[%s]", resp, status.Err().Error())
+					kg.Warnf("Failed to send a log=[%+v] err=[%s] CODE=%d", resp, status.Err().Error(), status.Code())
 					return status.Err()
 				default:
 					return nil
@@ -497,8 +497,8 @@ func (fd *Feeder) PushMessage(level, message string) {
 	pbMsg.Level = level
 	pbMsg.Message = message
 
-	MsgLock.Lock()
-	defer MsgLock.Unlock()
+	// MsgLock.Lock()
+	// defer MsgLock.Unlock()
 
 	for uid := range MsgStructs {
 		MsgStructs[uid].Broadcast <- &pbMsg
@@ -587,8 +587,8 @@ func (fd *Feeder) PushLog(log tp.Log) {
 
 		pbAlert.Result = log.Result
 
-		AlertLock.Lock()
-		defer AlertLock.Unlock()
+		// AlertLock.Lock()
+		// defer AlertLock.Unlock()
 
 		for uid := range AlertStructs {
 			AlertStructs[uid].Broadcast <- &pbAlert
@@ -624,8 +624,8 @@ func (fd *Feeder) PushLog(log tp.Log) {
 
 		pbLog.Result = log.Result
 
-		LogLock.Lock()
-		defer LogLock.Unlock()
+		//		LogLock.Lock()
+		//		defer LogLock.Unlock()
 
 		for uid := range LogStructs {
 			LogStructs[uid].Broadcast <- &pbLog