X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fvlog.c;h=0d7f4d159ab63c540f429b10756bffa0a2bfae8e;hb=3e3252fa1d7e057463ddbd66dab84f0d02ef0f1d;hp=265e9c6dd0bc914b53d27bb2f5b4db7a3538b45f;hpb=8628b0b71d1cf5b3bd7425e50f0aa1435aa38804;p=openvswitch diff --git a/lib/vlog.c b/lib/vlog.c index 265e9c6d..0d7f4d15 100644 --- a/lib/vlog.c +++ b/lib/vlog.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -186,7 +187,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,7 +323,25 @@ 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: @@ -346,7 +365,7 @@ vlog_set_levels_from_string(const char *s_) facility = strtok_r(NULL, ":", &save_ptr); - if (!facility || !strcmp(facility, "ANY")) { + if (!facility || !strcasecmp(facility, "ANY")) { e_facility = VLF_ANY_FACILITY; } else { e_facility = vlog_get_facility_val(facility); @@ -357,14 +376,14 @@ vlog_set_levels_from_string(const char *s_) } } - if (!strcmp(module, "PATTERN")) { + if (!strcasecmp(module, "PATTERN")) { vlog_set_pattern(e_facility, save_ptr); break; } else { char *level; enum vlog_level e_level; - if (!strcmp(module, "ANY")) { + if (!strcasecmp(module, "ANY")) { e_module = NULL; } else { e_module = vlog_module_from_name(module); @@ -406,17 +425,25 @@ 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(conn, 501, msg); + free(msg); + return; + } + } + unixctl_command_reply(conn, 202, 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); @@ -424,8 +451,8 @@ vlog_unixctl_list(struct unixctl_conn *conn, } 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(); @@ -464,9 +491,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", "{module[:facility[:level]] | 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. */ @@ -692,27 +722,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 +769,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 +777,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;