log: remove log_local_buf()

Have the server return -1 if it can't log, then we can handle
it internally.

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/log.c b/log.c
index d508267676b7f9d71f609d6ee5bf058c69897ef5..4eb4af5905c40a45c8df1bd12f4bf02a99ea70a0 100644 (file)
--- a/log.c
+++ b/log.c
@@ -8,9 +8,13 @@
 
 size_t log_info_buf(const char *buf, size_t len)
 {
-       if (is_backend)
-               return fio_server_text_output(FIO_LOG_INFO, buf, len);
-       else if (log_syslog) {
+       if (is_backend) {
+               size_t ret = fio_server_text_output(FIO_LOG_INFO, buf, len);
+               if (ret != -1)
+                       return ret;
+       }
+
+       if (log_syslog) {
                syslog(LOG_INFO, "%s", buf);
                return len;
        } else
@@ -27,16 +31,6 @@ size_t log_valist(const char *str, va_list args)
        return log_info_buf(buffer, min(len, sizeof(buffer) - 1));
 }
 
-size_t log_local_buf(const char *buf, size_t len)
-{
-       if (log_syslog)
-               syslog(LOG_INFO, "%s", buf);
-       else
-               len = fwrite(buf, len, 1, f_out);
-
-       return len;
-}
-
 size_t log_info(const char *format, ...)
 {
        char buffer[1024];
@@ -82,9 +76,13 @@ size_t log_err(const char *format, ...)
        va_end(args);
        len = min(len, sizeof(buffer) - 1);
 
-       if (is_backend)
-               return fio_server_text_output(FIO_LOG_ERR, buffer, len);
-       else if (log_syslog) {
+       if (is_backend) {
+               size_t ret = fio_server_text_output(FIO_LOG_ERR, buffer, len);
+               if (ret != -1)
+                       return ret;
+       }
+
+       if (log_syslog) {
                syslog(LOG_INFO, "%s", buffer);
                return len;
        } else {

diff --git a/log.h b/log.h
index f1cf0039a3eb76fa5c2cbfda883e79f97d306d20..a39dea61893194e7a45740e653dc1e57a39181de 100644 (file)
--- a/log.h
+++ b/log.h
@@ -13,7 +13,6 @@ extern size_t log_err(const char *format, ...) __attribute__ ((__format__ (__pri
 extern size_t log_info(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
 extern size_t __log_buf(struct buf_output *, const char *format, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
 extern size_t log_valist(const char *str, va_list);
-extern size_t log_local_buf(const char *buf, size_t);
 extern size_t log_info_buf(const char *buf, size_t len);
 extern int log_info_flush(void);
 

diff --git a/server.c b/server.c
index 31f179493aabf949edb8870dff154f99afba19a1..27ea282fa735dd702ddd9f40b8f5cac277bcc57d 100644 (file)
--- a/server.c
+++ b/server.c
@@ -1061,7 +1061,7 @@ int fio_server_text_output(int level, const char *buf, size_t len)
        struct timeval tv;
 
        if (server_fd == -1)
-               return log_local_buf(buf, len);
+               return -1;
 
        tlen = sizeof(*pdu) + len;
        pdu = malloc(tlen);