X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fvlog.c;h=4c97ef40b39bfdc613513cce37befb43915475bf;hb=6c0386119d614d5e26ca08cc3d8e527806b87ef9;hp=265e9c6dd0bc914b53d27bb2f5b4db7a3538b45f;hpb=8628b0b71d1cf5b3bd7425e50f0aa1435aa38804;p=sliver-openvswitch.git diff --git a/lib/vlog.c b/lib/vlog.c index 265e9c6dd..4c97ef40b 100644 --- a/lib/vlog.c +++ b/lib/vlog.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -81,9 +82,6 @@ static struct facility facilities[VLF_N_FACILITIES] = { #undef VLOG_FACILITY }; -/* Time at which vlog was initialized, in milliseconds. */ -static long long int boot_time; - /* VLF_FILE configuration. */ static char *log_file_name; static FILE *log_file; @@ -186,7 +184,7 @@ update_min_level(struct vlog_module *module) { enum vlog_facility facility; - module->min_level = VLL_EMER; + module->min_level = VLL_OFF; for (facility = 0; facility < VLF_N_FACILITIES; facility++) { if (log_file || facility != VLF_FILE) { enum vlog_level level = module->levels[facility]; @@ -322,72 +320,99 @@ vlog_set_log_file(const char *file_name) int vlog_reopen_log_file(void) { - return log_file_name ? vlog_set_log_file(log_file_name) : 0; + struct stat old, new; + + /* Skip re-opening if there's nothing to reopen. */ + if (!log_file_name) { + return 0; + } + + /* Skip re-opening if it would be a no-op because the old and new files are + * the same. (This avoids writing "closing log file" followed immediately + * by "opened log file".) */ + if (log_file + && !fstat(fileno(log_file), &old) + && !stat(log_file_name, &new) + && old.st_dev == new.st_dev + && old.st_ino == new.st_ino) { + return 0; + } + + return vlog_set_log_file(log_file_name); } -/* Set debugging levels: - * - * mod[:facility[:level]] mod2[:facility[:level]] ... - * - * Return null if successful, otherwise an error message that the caller must - * free(). - */ +/* Set debugging levels. Returns null if successful, otherwise an error + * message that the caller must free(). */ char * vlog_set_levels_from_string(const char *s_) { - char *save_ptr = NULL; char *s = xstrdup(s_); - char *module, *facility; - - for (module = strtok_r(s, ": \t", &save_ptr); module != NULL; - module = strtok_r(NULL, ": \t", &save_ptr)) { - struct vlog_module *e_module; - enum vlog_facility e_facility; + char *save_ptr = NULL; + char *msg = NULL; + char *word; - facility = strtok_r(NULL, ":", &save_ptr); + word = strtok_r(s, " ,:\t", &save_ptr); + if (word && !strcasecmp(word, "PATTERN")) { + enum vlog_facility facility; - if (!facility || !strcmp(facility, "ANY")) { - e_facility = VLF_ANY_FACILITY; - } else { - e_facility = vlog_get_facility_val(facility); - if (e_facility >= VLF_N_FACILITIES) { - char *msg = xasprintf("unknown facility \"%s\"", facility); - free(s); - return msg; - } + word = strtok_r(NULL, " ,:\t", &save_ptr); + if (!word) { + msg = xstrdup("missing facility"); + goto exit; } - if (!strcmp(module, "PATTERN")) { - vlog_set_pattern(e_facility, save_ptr); - break; - } else { - char *level; - enum vlog_level e_level; - - if (!strcmp(module, "ANY")) { - e_module = NULL; - } else { - e_module = vlog_module_from_name(module); - if (!e_module) { - char *msg = xasprintf("unknown module \"%s\"", module); - free(s); - return msg; + facility = (!strcasecmp(word, "ANY") + ? VLF_ANY_FACILITY + : vlog_get_facility_val(word)); + if (facility == VLF_N_FACILITIES) { + msg = xasprintf("unknown facility \"%s\"", word); + goto exit; + } + vlog_set_pattern(facility, save_ptr); + } else { + struct vlog_module *module = NULL; + enum vlog_level level = VLL_N_LEVELS; + enum vlog_facility facility = VLF_N_FACILITIES; + + for (; word != NULL; word = strtok_r(NULL, " ,:\t", &save_ptr)) { + if (!strcasecmp(word, "ANY")) { + continue; + } else if (vlog_get_facility_val(word) != VLF_N_FACILITIES) { + if (facility != VLF_N_FACILITIES) { + msg = xstrdup("cannot specify multiple facilities"); + goto exit; } + facility = vlog_get_facility_val(word); + } else if (vlog_get_level_val(word) != VLL_N_LEVELS) { + if (level != VLL_N_LEVELS) { + msg = xstrdup("cannot specify multiple levels"); + goto exit; + } + level = vlog_get_level_val(word); + } else if (vlog_module_from_name(word)) { + if (module) { + msg = xstrdup("cannot specify multiple modules"); + goto exit; + } + module = vlog_module_from_name(word); + } else { + msg = xasprintf("no facility, level, or module \"%s\"", word); + goto exit; } + } - level = strtok_r(NULL, ":", &save_ptr); - e_level = level ? vlog_get_level_val(level) : VLL_DBG; - if (e_level >= VLL_N_LEVELS) { - char *msg = xasprintf("unknown level \"%s\"", level); - free(s); - return msg; - } - - vlog_set_levels(e_module, e_facility, e_level); + if (facility == VLF_N_FACILITIES) { + facility = VLF_ANY_FACILITY; + } + if (level == VLL_N_LEVELS) { + level = VLL_DBG; } + vlog_set_levels(module, facility, level); } + +exit: free(s); - return NULL; + return msg; } /* If 'arg' is null, configure maximum verbosity. Otherwise, sets @@ -406,36 +431,44 @@ vlog_set_verbosity(const char *arg) } static void -vlog_unixctl_set(struct unixctl_conn *conn, - const char *args, void *aux OVS_UNUSED) +vlog_unixctl_set(struct unixctl_conn *conn, int argc, const char *argv[], + void *aux OVS_UNUSED) { - char *msg = vlog_set_levels_from_string(args); - unixctl_command_reply(conn, msg ? 501 : 202, msg); - free(msg); + int i; + + for (i = 1; i < argc; i++) { + char *msg = vlog_set_levels_from_string(argv[i]); + if (msg) { + unixctl_command_reply_error(conn, msg); + free(msg); + return; + } + } + unixctl_command_reply(conn, NULL); } static void -vlog_unixctl_list(struct unixctl_conn *conn, - const char *args OVS_UNUSED, void *aux OVS_UNUSED) +vlog_unixctl_list(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED) { char *msg = vlog_get_levels(); - unixctl_command_reply(conn, 200, msg); + unixctl_command_reply(conn, msg); free(msg); } static void -vlog_unixctl_reopen(struct unixctl_conn *conn, - const char *args OVS_UNUSED, void *aux OVS_UNUSED) +vlog_unixctl_reopen(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[] OVS_UNUSED, void *aux OVS_UNUSED) { if (log_file_name) { int error = vlog_reopen_log_file(); if (error) { - unixctl_command_reply(conn, 503, strerror(errno)); + unixctl_command_reply_error(conn, strerror(errno)); } else { - unixctl_command_reply(conn, 202, NULL); + unixctl_command_reply(conn, NULL); } } else { - unixctl_command_reply(conn, 403, "Logging to file not configured"); + unixctl_command_reply_error(conn, "Logging to file not configured"); } } @@ -453,7 +486,6 @@ vlog_init(void) openlog(program_name, LOG_NDELAY, LOG_DAEMON); - boot_time = time_msec(); now = time_wall(); if (now < 0) { struct tm tm; @@ -464,9 +496,12 @@ vlog_init(void) VLOG_ERR("current time is negative: %s (%ld)", s, (long int) now); } - unixctl_command_register("vlog/set", vlog_unixctl_set, NULL); - unixctl_command_register("vlog/list", vlog_unixctl_list, NULL); - unixctl_command_register("vlog/reopen", vlog_unixctl_reopen, NULL); + unixctl_command_register( + "vlog/set", "{spec | PATTERN:facility:pattern}", + 1, INT_MAX, vlog_unixctl_set, NULL); + unixctl_command_register("vlog/list", "", 0, 0, vlog_unixctl_list, NULL); + unixctl_command_register("vlog/reopen", "", 0, 0, + vlog_unixctl_reopen, NULL); } /* Closes the logging subsystem. */ @@ -580,7 +615,11 @@ format_log_message(const struct vlog_module *module, enum vlog_level level, break; case 'd': p = fetch_braces(p, "%Y-%m-%d %H:%M:%S", tmp, sizeof tmp); - ds_put_strftime(s, tmp, NULL); + ds_put_strftime(s, tmp, false); + break; + case 'D': + p = fetch_braces(p, "%Y-%m-%d %H:%M:%S", tmp, sizeof tmp); + ds_put_strftime(s, tmp, true); break; case 'm': /* Format user-supplied log message and trim trailing new-lines. */ @@ -605,7 +644,7 @@ format_log_message(const struct vlog_module *module, enum vlog_level level, ds_put_format(s, "%ld", (long int) getpid()); break; case 'r': - ds_put_format(s, "%lld", time_msec() - boot_time); + ds_put_format(s, "%lld", time_msec() - time_boot_msec()); break; default: ds_put_char(s, p[-1]); @@ -692,27 +731,26 @@ vlog(const struct vlog_module *module, enum vlog_level level, } void -vlog_fatal_valist(const struct vlog_module *module_, enum vlog_level level, +vlog_fatal_valist(const struct vlog_module *module_, const char *message, va_list args) { struct vlog_module *module = (struct vlog_module *) module_; /* Don't log this message to the console to avoid redundancy with the * message written by the later ovs_fatal_valist(). */ - module->levels[VLF_CONSOLE] = VLL_EMER; + module->levels[VLF_CONSOLE] = VLL_OFF; - vlog_valist(module, level, message, args); + vlog_valist(module, VLL_EMER, message, args); ovs_fatal_valist(0, message, args); } void -vlog_fatal(const struct vlog_module *module, enum vlog_level level, - const char *message, ...) +vlog_fatal(const struct vlog_module *module, const char *message, ...) { va_list args; va_start(args, message); - vlog_fatal_valist(module, level, message, args); + vlog_fatal_valist(module, message, args); va_end(args); } @@ -740,6 +778,7 @@ vlog_should_drop(const struct vlog_module *module, enum vlog_level level, if (!rl->n_dropped) { rl->first_dropped = now; } + rl->last_dropped = now; rl->n_dropped++; return true; } @@ -747,10 +786,15 @@ vlog_should_drop(const struct vlog_module *module, enum vlog_level level, rl->tokens -= VLOG_MSG_TOKENS; if (rl->n_dropped) { + time_t now = time_now(); + unsigned int first_dropped_elapsed = now - rl->first_dropped; + unsigned int last_dropped_elapsed = now - rl->last_dropped; + vlog(module, level, - "Dropped %u log messages in last %u seconds " - "due to excessive rate", - rl->n_dropped, (unsigned int) (time_now() - rl->first_dropped)); + "Dropped %u log messages in last %u seconds (most recently, " + "%u seconds ago) due to excessive rate", + rl->n_dropped, first_dropped_elapsed, last_dropped_elapsed); + rl->n_dropped = 0; } return false; @@ -773,7 +817,7 @@ void vlog_usage(void) { printf("\nLogging options:\n" - " -v, --verbose=MODULE[:FACILITY[:LEVEL]] set logging levels\n" + " -v, --verbose=[SPEC] set logging levels\n" " -v, --verbose set maximum verbosity level\n" " --log-file[=FILE] enable logging to specified FILE\n" " (default: %s/%s.log)\n",