Proxmox-Port/libqb
1
0
Fork 0
mirror of https://salsa.debian.org/ha-team/libqb synced 2026-08-08 11:14:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix: log: Filtering by function and file must match exactly, no substring matches

Browse Source
This commit is contained in:
David Vossel 2013-10-17 21:44:12 -05:00
parent 00082df49f
commit 9abb68637d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/log.c
View File

@ -103,9 +103,9 @@ _cs_matches_filter_(struct qb_log_callsite *cs,
snprintf(token, 499, "%.*s", (int)(next - offset), offset);
if (type == QB_LOG_FILTER_FILE) {
match = (strstr(cs->filename, token) != NULL);
match = (strcmp(cs->filename, token) == 0) ? 1 : 0;
} else {
match = (strstr(cs->function, token) != NULL);
match = (strcmp(cs->function, token) == 0) ? 1 : 0;
}
if (!match && next[0] != 0) {
next++;

6
tests/check_log.c
View File

@ -191,6 +191,7 @@ _test_logger(int32_t t,
test_buf[0] = '\0';
qb_log_target_format(t, cs, timestamp, msg, test_buf);
test_priority = cs->priority;
num_msgs++;
}
@ -282,6 +283,7 @@ START_TEST(test_log_basic)
rc = qb_log_ctl(t, QB_LOG_CONF_ENABLED, QB_TRUE);
ck_assert_int_eq(rc, 0);
/* captures last log */
memset(test_buf, 0, sizeof(test_buf));
test_priority = 0;
num_msgs = 0;
@ -304,7 +306,7 @@ START_TEST(test_log_basic)
qb_log_filter_ctl(t, QB_LOG_FILTER_CLEAR_ALL,
QB_LOG_FILTER_FILE, "*", LOG_TRACE);
qb_log_filter_ctl(t, QB_LOG_FILTER_ADD,
QB_LOG_FILTER_FUNCTION, "log_it_please", LOG_WARNING);
QB_LOG_FILTER_FUNCTION, "otherlogging,log_it_please,morelogging", LOG_WARNING);
num_msgs = 0;
qb_log(LOG_ERR, "try if you: log_it_please()");
@ -336,7 +338,7 @@ START_TEST(test_log_basic)
qb_log_filter_ctl(t, QB_LOG_FILTER_CLEAR_ALL,
QB_LOG_FILTER_FILE, "*", LOG_TRACE);
qb_log_filter_ctl(t, QB_LOG_FILTER_ADD,
QB_LOG_FILTER_FILE, __FILE__, LOG_DEBUG);
QB_LOG_FILTER_FILE, "fakefile.c,"__FILE__",otherfakefile", LOG_DEBUG);
/*
* make sure we can pass in a null filename or function name.
*/