From f0a6165a611c28e94513b1c2df5826b23d154ba4 Mon Sep 17 00:00:00 2001 From: Kevin Coffman Date: Fri, 12 Oct 2007 16:35:15 -0400 Subject: [PATCH] Cleanup xlog logging code to be safe and usable for all This patch reworks the xlog logging code to avoid rebuilding the message into a fixed size buffer. It also adds two new logging functions xlog_warn and xlog_err which are replacements for idmap_warn and idmap_err. There use to be two different variates of these functions with the only difference being that one flavor tacked on the error string to the end of the message. This responsibility has been pushed to the called of the function since it needlessly complicated the function and required us to rebuild the message strings. Signed-off-by: David P. Quigley Signed-off-by: Kevin Coffman Signed-off-by: Neil Brown --- support/include/xlog.h | 5 ++++ support/nfs/xlog.c | 64 ++++++++++++++++++++++++++++-------------- 2 files changed, 48 insertions(+), 21 deletions(-) diff --git a/support/include/xlog.h b/support/include/xlog.h index cf9bc91..fd1a3f4 100644 --- a/support/include/xlog.h +++ b/support/include/xlog.h @@ -7,6 +7,8 @@ #ifndef XLOG_H #define XLOG_H +#include + /* These are logged always. L_FATAL also does exit(1) */ #define L_FATAL 0x0100 #define L_ERROR 0x0200 @@ -40,5 +42,8 @@ void xlog_config(int fac, int on); void xlog_sconfig(char *, int on); int xlog_enabled(int fac); void xlog(int fac, const char *fmt, ...); +void xlog_warn(const char *fmt, ...); +void xlog_err(const char *fmt, ...); +void xlog_backend(int fac, const char *fmt, va_list args); #endif /* XLOG_H */ diff --git a/support/nfs/xlog.c b/support/nfs/xlog.c index 1bbfd19..26123c5 100644 --- a/support/nfs/xlog.c +++ b/support/nfs/xlog.c @@ -131,39 +131,28 @@ xlog_enabled(int fac) /* Write something to the system logfile and/or stderr */ void -xlog(int kind, const char *fmt, ...) +xlog_backend(int kind, const char *fmt, va_list args) { - char buff[1024]; - va_list args; - int n; - if (!(kind & (L_ALL)) && !(logging && (kind & logmask))) return; - va_start(args, fmt); - vsnprintf(buff, sizeof (buff), fmt, args); - va_end(args); - - if ((n = strlen(buff)) > 0 && buff[n-1] == '\n') - buff[--n] = '\0'; - if (log_syslog) { switch (kind) { case L_FATAL: - syslog(LOG_ERR, "%s", buff); + vsyslog(LOG_ERR, fmt, args); break; case L_ERROR: - syslog(LOG_ERR, "%s", buff); + vsyslog(LOG_ERR, fmt, args); break; case L_WARNING: - syslog(LOG_WARNING, "%s", buff); + vsyslog(LOG_WARNING, fmt, args); break; case L_NOTICE: - syslog(LOG_NOTICE, "%s", buff); + vsyslog(LOG_NOTICE, fmt, args); break; default: if (!log_stderr) - syslog(LOG_INFO, "%s", buff); + vsyslog(LOG_INFO, fmt, args); break; } } @@ -175,16 +164,49 @@ xlog(int kind, const char *fmt, ...) time(&now); tm = localtime(&now); - fprintf(stderr, "%s[%d] %04d-%02d-%02d %02d:%02d:%02d %s\n", + fprintf(stderr, "%s[%d] %04d-%02d-%02d %02d:%02d:%02d ", log_name, log_pid, tm->tm_year+1900, tm->tm_mon + 1, tm->tm_mday, - tm->tm_hour, tm->tm_min, tm->tm_sec, - buff); + tm->tm_hour, tm->tm_min, tm->tm_sec); #else - fprintf(stderr, "%s: %s\n", log_name, buff); + fprintf(stderr, "%s: ", log_name); #endif + + vfprintf(stderr, fmt, args); + fprintf(stderr, "\n"); } if (kind == L_FATAL) exit(1); } + +void +xlog(int kind, const char* fmt, ...) +{ + va_list args; + + va_start(args, fmt); + xlog_backend(kind, fmt, args); + va_end(args); +} + +void +xlog_warn(const char* fmt, ...) +{ + va_list args; + + va_start(args, fmt); + xlog_backend(L_WARNING, fmt, args); + va_end(args); +} + + +void +xlog_err(const char* fmt, ...) +{ + va_list args; + + va_start(args, fmt); + xlog_backend(L_FATAL, fmt, args); + va_end(args); +} -- 2.39.2