projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
steadystate: clean up checks for when steadystate termination is not engaged
[fio.git]
/
log.c
diff --git
a/log.c
b/log.c
index 8d511b549b9e2ff3caf88500a6b118bc65a8938b..4eb4af5905c40a45c8df1bd12f4bf02a99ea70a0 100644
(file)
--- a/
log.c
+++ b/
log.c
@@
-8,9
+8,13
@@
size_t log_info_buf(const char *buf, size_t len)
{
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
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));
}
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];
size_t log_info(const char *format, ...)
{
char buffer[1024];
@@
-59,9
+53,8
@@
size_t __log_buf(struct buf_output *buf, const char *format, ...)
va_start(args, format);
len = vsnprintf(buffer, sizeof(buffer), format, args);
va_end(args);
va_start(args, format);
len = vsnprintf(buffer, sizeof(buffer), format, args);
va_end(args);
- len = min(len, sizeof(buffer) - 1);
- return buf_output_add(buf, buffer,
len
);
+ return buf_output_add(buf, buffer,
min(len, sizeof(buffer) - 1)
);
}
int log_info_flush(void)
}
int log_info_flush(void)
@@
-83,9
+76,13
@@
size_t log_err(const char *format, ...)
va_end(args);
len = min(len, sizeof(buffer) - 1);
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 {
syslog(LOG_INFO, "%s", buffer);
return len;
} else {