X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fvlog.c;h=2598111a415b11469831854d82bce1b817c32469;hb=ee913f985d470515cc018e57ea56aac3f087702f;hp=ddda26620ec65f057014284cd7ccbfb003a3cbab;hpb=56cee53bd62d92bf2639e22beba3a867891a7513;p=sliver-openvswitch.git diff --git a/lib/vlog.c b/lib/vlog.c index ddda26620..2598111a4 100644 --- a/lib/vlog.c +++ b/lib/vlog.c @@ -33,7 +33,7 @@ #include "unixctl.h" #include "util.h" -VLOG_DEFINE_THIS_MODULE(vlog) +VLOG_DEFINE_THIS_MODULE(vlog); /* Name for each logging level. */ static const char *level_names[VLL_N_LEVELS] = { @@ -98,7 +98,7 @@ static void format_log_message(const struct vlog_module *, enum vlog_level, /* Searches the 'n_names' in 'names'. Returns the index of a match for * 'target', or 'n_names' if no name matches. */ static size_t -search_name_array(const char *target, const char **names, size_t n_names) +search_name_array(const char *target, const char **names, size_t n_names) { size_t i; @@ -122,14 +122,14 @@ vlog_get_level_name(enum vlog_level level) /* Returns the logging level with the given 'name', or VLL_N_LEVELS if 'name' * is not the name of a logging level. */ enum vlog_level -vlog_get_level_val(const char *name) +vlog_get_level_val(const char *name) { return search_name_array(name, level_names, ARRAY_SIZE(level_names)); } /* Returns the name for logging facility 'facility'. */ const char * -vlog_get_facility_name(enum vlog_facility facility) +vlog_get_facility_name(enum vlog_facility facility) { assert(facility < VLF_N_FACILITIES); return facilities[facility].name; @@ -138,7 +138,7 @@ vlog_get_facility_name(enum vlog_facility facility) /* Returns the logging facility named 'name', or VLF_N_FACILITIES if 'name' is * not the name of a logging facility. */ enum vlog_facility -vlog_get_facility_val(const char *name) +vlog_get_facility_val(const char *name) { size_t i; @@ -174,7 +174,7 @@ vlog_module_from_name(const char *name) /* Returns the current logging level for the given 'module' and 'facility'. */ enum vlog_level -vlog_get_level(const struct vlog_module *module, enum vlog_facility facility) +vlog_get_level(const struct vlog_module *module, enum vlog_facility facility) { assert(facility < VLF_N_FACILITIES); return module->levels[facility]; @@ -221,7 +221,7 @@ set_facility_level(enum vlog_facility facility, struct vlog_module *module, * across all modules or facilities, respectively. */ void vlog_set_levels(struct vlog_module *module, enum vlog_facility facility, - enum vlog_level level) + enum vlog_level level) { assert(facility < VLF_N_FACILITIES || facility == VLF_ANY_FACILITY); if (facility == VLF_ANY_FACILITY) { @@ -234,7 +234,7 @@ vlog_set_levels(struct vlog_module *module, enum vlog_facility facility, } static void -do_set_pattern(enum vlog_facility facility, const char *pattern) +do_set_pattern(enum vlog_facility facility, const char *pattern) { struct facility *f = &facilities[facility]; if (!f->default_pattern) { @@ -291,7 +291,7 @@ vlog_set_log_file(const char *file_name) old_log_file_name = log_file_name; log_file_name = (file_name ? xstrdup(file_name) - : xasprintf("%s/%s.log", ovs_logdir, program_name)); + : xasprintf("%s/%s.log", ovs_logdir(), program_name)); free(old_log_file_name); file_name = NULL; /* Might have been freed. */ @@ -438,9 +438,10 @@ vlog_unixctl_reopen(struct unixctl_conn *conn, } } -/* Initializes the logging subsystem. */ +/* Initializes the logging subsystem and registers its unixctl server + * commands. */ void -vlog_init(void) +vlog_init(void) { time_t now; @@ -469,7 +470,7 @@ vlog_init(void) /* Closes the logging subsystem. */ void -vlog_exit(void) +vlog_exit(void) { if (vlog_inited) { closelog(); @@ -733,12 +734,12 @@ vlog_rate_limit(const struct vlog_module *module, enum vlog_level level, } void -vlog_usage(void) +vlog_usage(void) { printf("\nLogging options:\n" " -v, --verbose=MODULE[:FACILITY[:LEVEL]] 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", - ovs_logdir, program_name); + ovs_logdir(), program_name); }