Correctly handle multiple clients for various command line arguments

[fio.git] / log.c

diff --git a/log.c b/log.c
index 5d1d0b52d5f48ec09f705f3bea04dddb53d7160d..a16baafc97846f68e08b1d466eff67ed130b24ae 100644 (file)
--- a/log.c
+++ b/log.c
@@ -2,9 +2,25 @@
 #include <fcntl.h>
 #include <string.h>
 #include <stdarg.h>
+#include <syslog.h>
 
 #include "fio.h"
 
+int log_valist(const char *str, va_list args)
+{
+       char buffer[1024];
+       size_t len;
+
+       len = vsnprintf(buffer, sizeof(buffer), str, args);
+
+       if (log_syslog)
+               syslog(LOG_INFO, "%s", buffer);
+       else
+               len = fwrite(buffer, len, 1, f_out);
+
+       return len;
+}
+
 int log_local(const char *format, ...)
 {
        char buffer[1024];
@@ -15,7 +31,12 @@ int log_local(const char *format, ...)
        len = vsnprintf(buffer, sizeof(buffer), format, args);
        va_end(args);
 
-       return fwrite(buffer, len, 1, f_out);
+       if (log_syslog)
+               syslog(LOG_INFO, "%s", buffer);
+       else
+               len = fwrite(buffer, len, 1, f_out);
+
+       return len;
 }
 
 int log_info(const char *format, ...)
@@ -47,8 +68,11 @@ int log_err(const char *format, ...)
        if (is_backend)
                return fio_server_text_output(buffer, len);
        else {
-               if (f_err != stderr)
-                       fwrite(buffer, len, 1, stderr);
+               if (f_err != stderr) {
+                       int fio_unused ret;
+
+                       ret = fwrite(buffer, len, 1, stderr);
+               }
 
                return fwrite(buffer, len, 1, f_err);
        }