Commit 5ee4728d authored by Tsuyoshi Uchida's avatar Tsuyoshi Uchida Committed by Daniel Verkamp
Browse files

log: define prioritynames[] (#102)

parent 49daf72e

lib/log/log.c

+22 −20
Original line number Diff line number Diff line
@@ -86,6 +86,18 @@ static const struct syslog_code facilitynames[] = { 
	{ 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

spdk_set_log_facility(const char *facility)

{
@@ -122,28 +134,18 @@ spdk_get_log_facility(void) 
int

spdk_set_log_priority(const char *priority)

{

	if (strcasecmp(priority, "emerg") == 0) {

		spdk_g_log_priority = LOG_EMERG;

	} else if (strcasecmp(priority, "alert") == 0) {

		spdk_g_log_priority = LOG_ALERT;

	} else if (strcasecmp(priority, "crit") == 0) {

		spdk_g_log_priority = LOG_CRIT;

	} 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 {

	int i;



	for (i = 0; prioritynames[i].c_name != NULL; i++) {

		if (strcasecmp(prioritynames[i].c_name, priority) == 0) {

			spdk_g_log_priority = prioritynames[i].c_val;

			return 0;

		}

	}



	spdk_g_log_priority = LOG_NOTICE;

	return -1;

}

	return 0;

}



void

spdk_noticelog(const char *file, const int line, const char *func,

test/lib/log/log_ut.c

+2 −0
Original line number Diff line number Diff line
@@ -65,8 +65,10 @@ log_test(void) 


	rc = spdk_set_log_priority("test");

	CU_ASSERT(rc == -1);

	CU_ASSERT_EQUAL(spdk_g_log_priority, LOG_NOTICE);

	rc = spdk_set_log_priority("debug");

	CU_ASSERT(rc == 0);

	CU_ASSERT_EQUAL(spdk_g_log_priority, LOG_DEBUG);



#ifdef DEBUG

	CU_ASSERT(spdk_log_get_trace_flag("debug") == false);