fix data format - still simple json

Author: Samuel Archambault

libpod/oci_conmon_common.go

@@ -1514,28 +1514,27 @@ func readConmonHealthCheckPipeData(ctr *Container, pipe *os.File) {
 			return
 		}
 
-		// Log the raw message received from conmon
-		logrus.Debugf("HEALTHCHECK: Raw message received from conmon for container %s: %q", ctr.ID(), string(b))
-		logrus.Debugf("HEALTHCHECK: Message length: %d bytes", len(b))
+		// Log the raw JSON string received from conmon
+		logrus.Debugf("HEALTHCHECK: Raw JSON received from conmon for container %s: %q", ctr.ID(), string(b))
+		logrus.Debugf("HEALTHCHECK: JSON length: %d bytes", len(b))
 
-		// Parse the message as a simple integer (no JSON)
-		messageStr := strings.TrimSpace(string(b))
-		messageType, err := strconv.Atoi(messageStr)
-		if err != nil {
-			logrus.Errorf("HEALTHCHECK: Failed to parse message as integer for container %s: %v", ctr.ID(), err)
+		// Parse the JSON
+		var si syncInfo
+		if err := json.Unmarshal(b, &si); err != nil {
+			logrus.Errorf("HEALTHCHECK: Failed to parse JSON from conmon for container %s: %v", ctr.ID(), err)
 			continue
 		}
 
-		logrus.Debugf("HEALTHCHECK: Parsed message type for container %s: %d", ctr.ID(), messageType)
+		logrus.Debugf("HEALTHCHECK: Parsed sync info for container %s: Data=%d, Message=%q", ctr.ID(), si.Data, si.Message)
 
 		// Handle healthcheck status updates based on your new encoding scheme
 		// Base message type is -100, status values are added to it:
 		// -100 + 0 (none) = -100
 		// -100 + 1 (starting) = -99
 		// -100 + 2 (healthy) = -98
 		// -100 + 3 (unhealthy) = -97
-		if messageType >= HealthCheckMsgStatusUpdate && messageType <= HealthCheckMsgStatusUpdate+HealthCheckStatusUnhealthy {
-			statusValue := messageType - HealthCheckMsgStatusUpdate // Convert back to status value
+		if si.Data >= HealthCheckMsgStatusUpdate && si.Data <= HealthCheckMsgStatusUpdate+HealthCheckStatusUnhealthy {
+			statusValue := si.Data - HealthCheckMsgStatusUpdate // Convert back to status value
 			var status string
 
 			switch statusValue {
@@ -1553,20 +1552,20 @@ func readConmonHealthCheckPipeData(ctr *Container, pipe *os.File) {
 			}
 
 			logrus.Infof("HEALTHCHECK: Received healthcheck status update for container %s: %s (message type: %d, status value: %d)",
-				ctr.ID(), status, messageType, statusValue)
+				ctr.ID(), status, si.Data, statusValue)
 
 			// Update the container's healthcheck status
 			if err := ctr.updateHealthStatus(status); err != nil {
 				logrus.Errorf("HEALTHCHECK: Failed to update healthcheck status for container %s: %v", ctr.ID(), err)
 			} else {
 				logrus.Infof("HEALTHCHECK: Successfully updated healthcheck status for container %s to %s", ctr.ID(), status)
 			}
-		} else if messageType < 0 {
+		} else if si.Data < 0 {
 			// Other negative message types - might be healthcheck related but not recognized
-			logrus.Debugf("HEALTHCHECK: Received unrecognized negative message type %d for container %s - might be healthcheck related", messageType, ctr.ID())
-		} else if messageType > 0 {
+			logrus.Debugf("HEALTHCHECK: Received unrecognized negative message type %d for container %s - might be healthcheck related", si.Data, ctr.ID())
+		} else if si.Data > 0 {
 			// Positive message types - not healthcheck related
-			logrus.Debugf("HEALTHCHECK: Received positive message type %d for container %s - not healthcheck related", messageType, ctr.ID())
+			logrus.Debugf("HEALTHCHECK: Received positive message type %d for container %s - not healthcheck related", si.Data, ctr.ID())
 		}
 	}
 }