Merge pull request #629 from jnovy/ffix

Fix k8s-file log format for terminating F-sequence

Author: jnovy

src/ctr_logging.c

@@ -510,14 +510,14 @@ static int write_k8s_log(stdpipe_t pipe, const char *buf, ssize_t buflen)
 
 		if (writev_buffer_append_segment(k8s_log_fd, &bufv, tsbuf, TSBUFLEN - 1) >= 0) {
 			timestamp_written = true;
-			if (writev_buffer_append_segment(k8s_log_fd, &bufv, "F\n", 2) >= 0) {
+			if (writev_buffer_append_segment(k8s_log_fd, &bufv, "F \n", 3) >= 0) {
 				f_sequence_written = true;
 			}
 		}
 
 		if (timestamp_written && f_sequence_written) {
-			k8s_bytes_written += TSBUFLEN - 1 + 2;
-			k8s_total_bytes_written += TSBUFLEN - 1 + 2;
+			k8s_bytes_written += TSBUFLEN - 1 + 3;
+			k8s_total_bytes_written += TSBUFLEN - 1 + 3;
 		} else {
 			if (!timestamp_written) {
 				nwarn("failed to write timestamp for terminating F-sequence");

test/09-partial-log-test.bats

@@ -80,7 +80,7 @@ teardown() {
             return 1
         }
 
-        echo "$log_content" | grep -q "stdout F$" || {
+        echo "$log_content" | grep -q "stdout F $" || {
             echo "Expected F-sequence not found"
             return 1
         }
@@ -133,7 +133,7 @@ teardown() {
 
     # For normal output with newlines, should NOT have standalone F-sequences
     # (F-sequences should only appear for partial line termination)
-    ! echo "$log_content" | grep -q "stdout F$" || {
+    ! echo "$log_content" | grep -q "stdout F $" || {
         echo "Unexpected standalone F-sequence found for normal output"
         return 1
     }