Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Debug log bugfix #726

Merged
merged 2 commits into from
Apr 14, 2021
Merged

Debug log bugfix #726

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03e496f
Fix DEBUG level do not work with dpdk-stable-18.11.2, because dpdk-st…
Nov 23, 2020
3a12c50
fix logging problem for debug level
ywc689 Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 26 additions & 10 deletions src/global_conf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,43 @@ static void log_current_time(void)
RTE_LOG(INFO, CFG_FILE, "load dpvs configuation file at %s\n", buf);
}

static inline void set_log_level_dynamic_types(const char *regex, uint32_t level)
{
#if RTE_VERSION >= RTE_VERSION_NUM(17, 5, 0, 0)
rte_log_set_level_regexp(regex, level);
#endif
}

static int set_log_level(char *log_level)
{
if (!log_level)
if (!log_level) {
rte_log_set_global_level(RTE_LOG_DEBUG);
else if (!strncmp(log_level, "EMERG", strlen("EMERG")))
set_log_level_dynamic_types("user[0-9]", RTE_LOG_DEBUG);
} else if (!strncmp(log_level, "EMERG", strlen("EMERG"))) {
rte_log_set_global_level(RTE_LOG_EMERG);
else if (!strncmp(log_level, "ALERT", strlen("ALERT")))
set_log_level_dynamic_types("user[0-9]", RTE_LOG_EMERG);
} else if (!strncmp(log_level, "ALERT", strlen("ALERT"))) {
rte_log_set_global_level(RTE_LOG_ALERT);
else if (!strncmp(log_level, "CRIT", strlen("CRIT")))
set_log_level_dynamic_types("user[0-9]", RTE_LOG_ALERT);
} else if (!strncmp(log_level, "CRIT", strlen("CRIT"))) {
rte_log_set_global_level(RTE_LOG_CRIT);
else if (!strncmp(log_level, "ERR", strlen("ERR")))
set_log_level_dynamic_types("user[0-9]", RTE_LOG_CRIT);
} else if (!strncmp(log_level, "ERR", strlen("ERR"))) {
rte_log_set_global_level(RTE_LOG_ERR);
else if (!strncmp(log_level, "WARNING", strlen("WARNING")))
set_log_level_dynamic_types("user[0-9]", RTE_LOG_ERR);
} else if (!strncmp(log_level, "WARNING", strlen("WARNING"))) {
rte_log_set_global_level(RTE_LOG_WARNING);
else if (!strncmp(log_level, "NOTICE", strlen("NOTICE")))
set_log_level_dynamic_types("user[0-9]", RTE_LOG_WARNING);
} else if (!strncmp(log_level, "NOTICE", strlen("NOTICE"))) {
rte_log_set_global_level(RTE_LOG_NOTICE);
else if (!strncmp(log_level, "INFO", strlen("INFO")))
set_log_level_dynamic_types("user[0-9]", RTE_LOG_NOTICE);
} else if (!strncmp(log_level, "INFO", strlen("INFO"))) {
rte_log_set_global_level(RTE_LOG_INFO);
else if (!strncmp(log_level, "DEBUG", strlen("DEBUG")))
set_log_level_dynamic_types("user[0-9]", RTE_LOG_INFO);
} else if (!strncmp(log_level, "DEBUG", strlen("DEBUG"))) {
rte_log_set_global_level(RTE_LOG_DEBUG);
else {
set_log_level_dynamic_types("user[0-9]", RTE_LOG_DEBUG);
} else {
RTE_LOG(WARNING, CFG_FILE, "%s: illegal log level: %s\n",
__func__, log_level);
return EDPVS_INVAL;
Expand Down