X-Git-Url: https://git.octo.it/?p=collectd.git;a=blobdiff_plain;f=src%2Flogfile.c;h=db12291540aea9e896800088c7ecbd1240ffc0aa;hp=11797182639e35902be3e431022f667d9eb99839;hb=7111bb6df7628edce3a8e538b386fbe27633a191;hpb=2bda2a5648c87a2c5b8304238cd80ff17984c5cd diff --git a/src/logfile.c b/src/logfile.c index 11797182..de9b1f75 100644 --- a/src/logfile.c +++ b/src/logfile.c @@ -27,13 +27,10 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" -#include - -#define DEFAULT_LOGFILE LOCALSTATEDIR"/log/collectd.log" - #if COLLECT_DEBUG static int log_level = LOG_DEBUG; #else @@ -46,190 +43,164 @@ static char *log_file = NULL; static int print_timestamp = 1; static int print_severity = 0; -static const char *config_keys[] = -{ - "LogLevel", - "File", - "Timestamp", - "PrintSeverity" -}; -static int config_keys_num = STATIC_ARRAY_SIZE (config_keys); - -static int logfile_config (const char *key, const char *value) -{ - if (0 == strcasecmp (key, "LogLevel")) { - log_level = parse_log_severity(value); - if (log_level < 0) { - log_level = LOG_INFO; - ERROR ("logfile: invalid loglevel [%s] defaulting to 'info'", value); - return (1); - } - } - else if (0 == strcasecmp (key, "File")) { - sfree (log_file); - log_file = strdup (value); - } - else if (0 == strcasecmp (key, "Timestamp")) { - if (IS_FALSE (value)) - print_timestamp = 0; - else - print_timestamp = 1; - } else if (0 == strcasecmp(key, "PrintSeverity")) { - if (IS_FALSE (value)) - print_severity = 0; - else - print_severity = 1; - } - else { - return -1; - } - return 0; +static const char *config_keys[] = {"LogLevel", "File", "Timestamp", + "PrintSeverity"}; +static int config_keys_num = STATIC_ARRAY_SIZE(config_keys); + +static int logfile_config(const char *key, const char *value) { + if (0 == strcasecmp(key, "LogLevel")) { + log_level = parse_log_severity(value); + if (log_level < 0) { + log_level = LOG_INFO; + ERROR("logfile: invalid loglevel [%s] defaulting to 'info'", value); + return 1; + } + } else if (0 == strcasecmp(key, "File")) { + sfree(log_file); + log_file = strdup(value); + } else if (0 == strcasecmp(key, "Timestamp")) { + if (IS_FALSE(value)) + print_timestamp = 0; + else + print_timestamp = 1; + } else if (0 == strcasecmp(key, "PrintSeverity")) { + if (IS_FALSE(value)) + print_severity = 0; + else + print_severity = 1; + } else { + return -1; + } + return 0; } /* int logfile_config (const char *, const char *) */ -static void logfile_print (const char *msg, int severity, - cdtime_t timestamp_time) -{ - FILE *fh; - _Bool do_close = 0; - struct tm timestamp_tm; - char timestamp_str[64]; - char level_str[16] = ""; - - if (print_severity) - { - switch (severity) - { - case LOG_ERR: - snprintf(level_str, sizeof (level_str), "[error] "); - break; - case LOG_WARNING: - snprintf(level_str, sizeof (level_str), "[warning] "); - break; - case LOG_NOTICE: - snprintf(level_str, sizeof (level_str), "[notice] "); - break; - case LOG_INFO: - snprintf(level_str, sizeof (level_str), "[info] "); - break; - case LOG_DEBUG: - snprintf(level_str, sizeof (level_str), "[debug] "); - break; - default: - break; - } - } - - if (print_timestamp) - { - time_t tt = CDTIME_T_TO_TIME_T (timestamp_time); - localtime_r (&tt, ×tamp_tm); - - strftime (timestamp_str, sizeof (timestamp_str), "%Y-%m-%d %H:%M:%S", - ×tamp_tm); - timestamp_str[sizeof (timestamp_str) - 1] = '\0'; - } - - pthread_mutex_lock (&file_lock); - - if (log_file == NULL) - { - fh = fopen (DEFAULT_LOGFILE, "a"); - do_close = 1; - } - else if (strcasecmp (log_file, "stderr") == 0) - fh = stderr; - else if (strcasecmp (log_file, "stdout") == 0) - fh = stdout; - else - { - fh = fopen (log_file, "a"); - do_close = 1; - } - - if (fh == NULL) - { - char errbuf[1024]; - fprintf (stderr, "logfile plugin: fopen (%s) failed: %s\n", - (log_file == NULL) ? DEFAULT_LOGFILE : log_file, - sstrerror (errno, errbuf, sizeof (errbuf))); - } - else - { - if (print_timestamp) - fprintf (fh, "[%s] %s%s\n", timestamp_str, level_str, msg); - else - fprintf (fh, "%s%s\n", level_str, msg); - - if (do_close) { - fclose (fh); - } else { - fflush(fh); - } - } - - pthread_mutex_unlock (&file_lock); - - return; +static void logfile_print(const char *msg, int severity, + cdtime_t timestamp_time) { + FILE *fh; + _Bool do_close = 0; + char timestamp_str[64]; + char level_str[16] = ""; + + if (print_severity) { + switch (severity) { + case LOG_ERR: + snprintf(level_str, sizeof(level_str), "[error] "); + break; + case LOG_WARNING: + snprintf(level_str, sizeof(level_str), "[warning] "); + break; + case LOG_NOTICE: + snprintf(level_str, sizeof(level_str), "[notice] "); + break; + case LOG_INFO: + snprintf(level_str, sizeof(level_str), "[info] "); + break; + case LOG_DEBUG: + snprintf(level_str, sizeof(level_str), "[debug] "); + break; + default: + break; + } + } + + if (print_timestamp) { + struct tm timestamp_tm; + localtime_r(&CDTIME_T_TO_TIME_T(timestamp_time), ×tamp_tm); + + strftime(timestamp_str, sizeof(timestamp_str), "%Y-%m-%d %H:%M:%S", + ×tamp_tm); + timestamp_str[sizeof(timestamp_str) - 1] = '\0'; + } + + pthread_mutex_lock(&file_lock); + + if (log_file == NULL) { + fh = stderr; + } else if (strcasecmp(log_file, "stderr") == 0) + fh = stderr; + else if (strcasecmp(log_file, "stdout") == 0) + fh = stdout; + else { + fh = fopen(log_file, "a"); + do_close = 1; + } + + if (fh == NULL) { + char errbuf[1024]; + fprintf(stderr, "logfile plugin: fopen (%s) failed: %s\n", log_file, + sstrerror(errno, errbuf, sizeof(errbuf))); + } else { + if (print_timestamp) + fprintf(fh, "[%s] %s%s\n", timestamp_str, level_str, msg); + else + fprintf(fh, "%s%s\n", level_str, msg); + + if (do_close) { + fclose(fh); + } else { + fflush(fh); + } + } + + pthread_mutex_unlock(&file_lock); + + return; } /* void logfile_print */ -static void logfile_log (int severity, const char *msg, - user_data_t __attribute__((unused)) *user_data) -{ - if (severity > log_level) - return; +static void logfile_log(int severity, const char *msg, + user_data_t __attribute__((unused)) * user_data) { + if (severity > log_level) + return; - logfile_print (msg, severity, cdtime ()); + logfile_print(msg, severity, cdtime()); } /* void logfile_log (int, const char *) */ -static int logfile_notification (const notification_t *n, - user_data_t __attribute__((unused)) *user_data) -{ - char buf[1024] = ""; - char *buf_ptr = buf; - int buf_len = sizeof (buf); - int status; - - status = ssnprintf (buf_ptr, buf_len, "Notification: severity = %s", - (n->severity == NOTIF_FAILURE) ? "FAILURE" - : ((n->severity == NOTIF_WARNING) ? "WARNING" - : ((n->severity == NOTIF_OKAY) ? "OKAY" : "UNKNOWN"))); - if (status > 0) - { - buf_ptr += status; - buf_len -= status; - } - -#define APPEND(bufptr, buflen, key, value) \ - if ((buflen > 0) && (strlen (value) > 0)) { \ - status = ssnprintf (bufptr, buflen, ", %s = %s", key, value); \ - if (status > 0) { \ - bufptr += status; \ - buflen -= status; \ - } \ - } - APPEND (buf_ptr, buf_len, "host", n->host); - APPEND (buf_ptr, buf_len, "plugin", n->plugin); - APPEND (buf_ptr, buf_len, "plugin_instance", n->plugin_instance); - APPEND (buf_ptr, buf_len, "type", n->type); - APPEND (buf_ptr, buf_len, "type_instance", n->type_instance); - APPEND (buf_ptr, buf_len, "message", n->message); - - buf[sizeof (buf) - 1] = '\0'; - - logfile_print (buf, LOG_INFO, - (n->time != 0) ? n->time : cdtime ()); - - return (0); +static int logfile_notification(const notification_t *n, + user_data_t __attribute__((unused)) * + user_data) { + char buf[1024] = ""; + char *buf_ptr = buf; + int buf_len = sizeof(buf); + int status; + + status = snprintf( + buf_ptr, buf_len, "Notification: severity = %s", + (n->severity == NOTIF_FAILURE) + ? "FAILURE" + : ((n->severity == NOTIF_WARNING) + ? "WARNING" + : ((n->severity == NOTIF_OKAY) ? "OKAY" : "UNKNOWN"))); + if (status > 0) { + buf_ptr += status; + buf_len -= status; + } + +#define APPEND(bufptr, buflen, key, value) \ + if ((buflen > 0) && (strlen(value) > 0)) { \ + status = snprintf(bufptr, buflen, ", %s = %s", key, value); \ + if (status > 0) { \ + bufptr += status; \ + buflen -= status; \ + } \ + } + APPEND(buf_ptr, buf_len, "host", n->host); + APPEND(buf_ptr, buf_len, "plugin", n->plugin); + APPEND(buf_ptr, buf_len, "plugin_instance", n->plugin_instance); + APPEND(buf_ptr, buf_len, "type", n->type); + APPEND(buf_ptr, buf_len, "type_instance", n->type_instance); + APPEND(buf_ptr, buf_len, "message", n->message); + + buf[sizeof(buf) - 1] = '\0'; + + logfile_print(buf, LOG_INFO, (n->time != 0) ? n->time : cdtime()); + + return 0; } /* int logfile_notification */ -void module_register (void) -{ - plugin_register_config ("logfile", logfile_config, - config_keys, config_keys_num); - plugin_register_log ("logfile", logfile_log, /* user_data = */ NULL); - plugin_register_notification ("logfile", logfile_notification, - /* user_data = */ NULL); +void module_register(void) { + plugin_register_config("logfile", logfile_config, config_keys, + config_keys_num); + plugin_register_log("logfile", logfile_log, /* user_data = */ NULL); + plugin_register_notification("logfile", logfile_notification, + /* user_data = */ NULL); } /* void module_register (void) */ - -/* vim: set sw=4 ts=4 tw=78 noexpandtab : */ -