ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

log: define prioritynames[] (#102)

Browse Source
This commit is contained in:
Tsuyoshi Uchida 2017-01-23 15:07:29 -08:00 committed by Daniel Verkamp
parent 49daf72e0e
commit 5ee4728d0c
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/log/log.c
View File

@ -86,6 +86,18 @@ static const struct syslog_code facilitynames[] = {
{ NULL, -1, } { NULL, -1, }
}; };
static const struct syslog_code prioritynames[] = {
{ "alert", LOG_ALERT, },
{ "crit", LOG_CRIT, },
{ "debug", LOG_DEBUG, },
{ "emerg", LOG_EMERG, },
{ "err", LOG_ERR, },
{ "info", LOG_INFO, },
{ "notice", LOG_NOTICE, },
{ "warning", LOG_WARNING, },
{ NULL, -1, }
};
int int
spdk_set_log_facility(const char *facility) spdk_set_log_facility(const char *facility)
{ {
@ -122,27 +134,17 @@ spdk_get_log_facility(void)
int int
spdk_set_log_priority(const char *priority) spdk_set_log_priority(const char *priority)
{ {
if (strcasecmp(priority, "emerg") == 0) { int i;
spdk_g_log_priority = LOG_EMERG;
} else if (strcasecmp(priority, "alert") == 0) { for (i = 0; prioritynames[i].c_name != NULL; i++) {
spdk_g_log_priority = LOG_ALERT; if (strcasecmp(prioritynames[i].c_name, priority) == 0) {
} else if (strcasecmp(priority, "crit") == 0) { spdk_g_log_priority = prioritynames[i].c_val;
spdk_g_log_priority = LOG_CRIT; return 0;
} else if (strcasecmp(priority, "err") == 0) { }
spdk_g_log_priority = LOG_ERR;
} else if (strcasecmp(priority, "warning") == 0) {
spdk_g_log_priority = LOG_WARNING;
} else if (strcasecmp(priority, "notice") == 0) {
spdk_g_log_priority = LOG_NOTICE;
} else if (strcasecmp(priority, "info") == 0) {
spdk_g_log_priority = LOG_INFO;
} else if (strcasecmp(priority, "debug") == 0) {
spdk_g_log_priority = LOG_DEBUG;
} else {
spdk_g_log_priority = LOG_NOTICE;
return -1;
} }
return 0;
spdk_g_log_priority = LOG_NOTICE;
return -1;
} }
void void

2
test/lib/log/log_ut.c
View File

@ -65,8 +65,10 @@ log_test(void)
rc = spdk_set_log_priority("test"); rc = spdk_set_log_priority("test");
CU_ASSERT(rc == -1); CU_ASSERT(rc == -1);
CU_ASSERT_EQUAL(spdk_g_log_priority, LOG_NOTICE);
rc = spdk_set_log_priority("debug"); rc = spdk_set_log_priority("debug");
CU_ASSERT(rc == 0); CU_ASSERT(rc == 0);
CU_ASSERT_EQUAL(spdk_g_log_priority, LOG_DEBUG);
#ifdef DEBUG #ifdef DEBUG
CU_ASSERT(spdk_log_get_trace_flag("debug") == false); CU_ASSERT(spdk_log_get_trace_flag("debug") == false);