Merge branch 'master' into gfio

[fio.git] / log.c

diff --git a/log.c b/log.c
index 08509b32b0150f85a55d76c38776d00d856be159..d481edf2fd17efb711d454047f625e56b1aebe49 100644 (file)
--- a/log.c
+++ b/log.c
@@ -63,7 +63,7 @@ int log_info(const char *format, ...)
        len = min(len, sizeof(buffer) - 1);
 
        if (is_backend)
        len = min(len, sizeof(buffer) - 1);
 
        if (is_backend)

-               return fio_server_text_output(buffer, len);
+               return fio_server_text_output(FIO_LOG_INFO, buffer, len);

        else if (log_syslog) {
                syslog(LOG_INFO, "%s", buffer);
                return len;
        else if (log_syslog) {
                syslog(LOG_INFO, "%s", buffer);
                return len;


@@ -83,7 +83,7 @@ int log_err(const char *format, ...)
        len = min(len, sizeof(buffer) - 1);
 
        if (is_backend)
        len = min(len, sizeof(buffer) - 1);
 
        if (is_backend)

-               return fio_server_text_output(buffer, len);
+               return fio_server_text_output(FIO_LOG_ERR, buffer, len);

        else if (log_syslog) {
                syslog(LOG_INFO, "%s", buffer);
                return len;
        else if (log_syslog) {
                syslog(LOG_INFO, "%s", buffer);
                return len;


@@ -97,3 +97,14 @@ int log_err(const char *format, ...)
                return fwrite(buffer, len, 1, f_err);
        }
 }
                return fwrite(buffer, len, 1, f_err);
        }
 }

+
+const char *log_get_level(int level)
+{
+       static const char *levels[] = { "Unknown", "Debug", "Info", "Error",
+                                               "Unknown" };
+
+       if (level >= FIO_LOG_NR)
+               level = FIO_LOG_NR;
+
+       return levels[level];
+}