X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=log.c;h=c4a3b52075367919b191219f84d14a9b46936338;hp=08509b32b0150f85a55d76c38776d00d856be159;hb=ef3d8e53c01456f22a61c162e4e5a3997af14a5d;hpb=98ffb8f3ecebed9984d1744f142eb8be10c14dbd

diff --git a/log.c b/log.c
index 08509b32..c4a3b520 100644
--- a/log.c
+++ b/log.c
@@ -14,6 +14,8 @@ int log_valist(const char *str, va_list args)
 	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
@@ -32,25 +34,6 @@ int log_local_buf(const char *buf, size_t len)
 	return len;
 }
 
-int log_local(const char *format, ...)
-{
-	char buffer[1024];
-	va_list args;
-	size_t len;
-
-	va_start(args, format);
-	len = vsnprintf(buffer, sizeof(buffer), format, args);
-	va_end(args);
-	len = min(len, sizeof(buffer) - 1);
-
-	if (log_syslog)
-		syslog(LOG_INFO, "%s", buffer);
-	else
-		len = fwrite(buffer, len, 1, f_out);
-
-	return len;
-}
-
 int log_info(const char *format, ...)
 {
 	char buffer[1024];
@@ -63,7 +46,7 @@ int log_info(const char *format, ...)
 	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;
@@ -71,6 +54,14 @@ int log_info(const char *format, ...)
 		return fwrite(buffer, len, 1, f_out);
 }
 
+int log_info_flush(void)
+{
+	if (is_backend || log_syslog)
+		return 0;
+
+	return fflush(f_out);
+}
+
 int log_err(const char *format, ...)
 {
 	char buffer[1024];
@@ -83,7 +74,7 @@ int log_err(const char *format, ...)
 	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;
@@ -97,3 +88,14 @@ int log_err(const char *format, ...)
 		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];
+}