debug: ensure that __dprint() is also logged over the network
We force local logging now, but that's not terribly useful
if you can't see the output from the backend. Make it follow
the usual rules of logging over the network if a backend, to
syslog, or locally.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/debug.c b/debug.c
index 5e98063..013cd53 100644
--- a/debug.c
+++ b/debug.c
@@ -16,8 +16,8 @@
&& pid != *fio_debug_jobp)
return;
- log_local("%-8s ", debug_levels[type].name);
- log_local("%-5u ", (int) pid);
+ log_info("%-8s ", debug_levels[type].name);
+ log_info("%-5u ", (int) pid);
va_start(args, str);
log_valist(str, args);
diff --git a/log.c b/log.c
index 4822c33..a05a7ec 100644
--- a/log.c
+++ b/log.c
@@ -14,6 +14,8 @@
len = vsnprintf(buffer, sizeof(buffer), str, args);
len = min(len, sizeof(buffer) - 1);
+ if (is_backend)
+ len = fio_server_text_output(FIO_LOG_INFO, buffer, len);
if (log_syslog)
syslog(LOG_INFO, "%s", buffer);
else
diff --git a/log.h b/log.h
index a885be7..e509313 100644
--- a/log.h
+++ b/log.h
@@ -9,7 +9,6 @@
extern int log_err(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
extern int log_info(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
-extern int log_local(const char *format, ...) __attribute__ ((__format__ (__printf__, 1, 2)));
extern int log_valist(const char *str, va_list);
extern int log_local_buf(const char *buf, size_t);
extern int log_info_flush(void);