From 408e0b90d74196f173c2008bc0034b70e9b56ddf Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Thu, 10 Dec 2015 15:31:02 -0700 Subject: [PATCH 1/1] 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 --- log.c | 30 ++++++++++++++---------------- log.h | 1 - server.c | 2 +- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/log.c b/log.c index d5082676..4eb4af59 100644 --- 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 f1cf0039..a39dea61 100644 --- 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 31f17949..27ea282f 100644 --- 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); -- 2.25.1