Revert "Remove data loss possibility in the log_file struct"

This reverts commit 64b01bc83d247c02b0ef31b26ffd58a6741e1fdc.

It turned out that the commit worked too well :)

Change-Id: Id6005ebd0d281cbd60e1a369a8e1cf10e8a600a9

diff --git a/Makefile.am b/Makefile.am
index 9e238c0..fea8f63 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -468,7 +468,7 @@ src_tests_libdlog_prio_filter_pos_SOURCES = src/tests/libdlog_prio_filter_pos.c
 src_tests_libdlog_prio_filter_pos_CFLAGS = $(check_CFLAGS) -pthread
 src_tests_libdlog_prio_filter_pos_LDFLAGS = $(AM_LDFLAGS) -lpthread -Wl,--wrap=log_config_read
 
-src_tests_log_file_SOURCES = src/tests/log_file.c src/shared/log_file.c src/shared/logcommon.c
+src_tests_log_file_SOURCES = src/tests/log_file.c src/shared/log_file.c
 src_tests_log_file_CFLAGS = $(check_CFLAGS)
 src_tests_log_file_LDFLAGS = $(AM_LDFLAGS) -Wl,--wrap=strdup,--wrap=free,--wrap=memcpy,--wrap=snprintf,--wrap=open,--wrap=open64,--wrap=fstat,--wrap=fstat64,--wrap=rename,--wrap=dlogutil_entry_get_timestamp,--wrap=log_print_log_line,--wrap=dlogutil_entry_get_tag,--wrap=isatty
 

diff --git a/src/shared/log_file.c b/src/shared/log_file.c
index 447742b..47f4ca1 100644 (file)
--- a/src/shared/log_file.c
+++ b/src/shared/log_file.c
@@ -261,11 +261,9 @@ int logfile_flush(struct log_file *file)
        if (!file->buffer.data)
                return 0;
 
-       /* This can cause the logs to linger in the buffer in case of an error (TODO?), but it's better than
-        * data loss on partial write, and is not a real issue since everybody quits on write error. */
-       int written = full_write(file->fd, file->buffer.data, file->buffer.position);
-       if (written > 0)
-               file->buffer.position = 0;
+       int written = write(file->fd, file->buffer.data, file->buffer.position);
+       if (write > 0)
+               file->buffer.position = 0; // TODO: data loss possibility here
        return written;
 }