diff options
author | Neels Hofmeyr <neels@hofmeyr.de> | 2017-10-27 03:35:45 +0200 |
---|---|---|
committer | Harald Welte <laforge@gnumonks.org> | 2017-10-28 16:49:46 +0000 |
commit | 6eb231eccc38c0d90ab09e9456212d28d6c5d5e6 (patch) | |
tree | 91203a0cd17bddc1714c70e960f3644c0f2be828 | |
parent | dbced93b5f988d370db6ea628d1d2fcdaba93f14 (diff) |
fix default logging levels to NOTICE, not DEBUG
Tweak unit test binaries to still used DEBUG loglevels, so that their expected
outputs remain unchanged (and nicely verbose).
Adjust test_nodes.vty, now expecting the 'notice' log levels upon
'show running-config'.
Change-Id: Ic061e61c9625b49cef8bc2a2c0b936e262c22268
-rw-r--r-- | src/logging.c | 6 | ||||
-rw-r--r-- | tests/auc/auc_test.c | 1 | ||||
-rw-r--r-- | tests/auc/gen_ts_55_205_test_sets/main_template.c | 1 | ||||
-rw-r--r-- | tests/db/db_test.c | 1 | ||||
-rw-r--r-- | tests/test_nodes.vty | 6 |
5 files changed, 9 insertions, 6 deletions
diff --git a/src/logging.c b/src/logging.c index 9b8de45..f81781d 100644 --- a/src/logging.c +++ b/src/logging.c @@ -5,19 +5,19 @@ const struct log_info_cat hlr_log_info_cat[] = { [DMAIN] = { .name = "DMAIN", .description = "Main Program", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DDB] = { .name = "DDB", .description = "Database Layer", .color = "\033[1;31m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, [DAUC] = { .name = "DAUC", .description = "Authentication Center", .color = "\033[1;33m", - .enabled = 1, .loglevel = LOGL_DEBUG, + .enabled = 1, .loglevel = LOGL_NOTICE, }, }; diff --git a/tests/auc/auc_test.c b/tests/auc/auc_test.c index f047a97..e9c114c 100644 --- a/tests/auc/auc_test.c +++ b/tests/auc/auc_test.c @@ -615,6 +615,7 @@ int main(int argc, char **argv) log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); + log_parse_category_mask(osmo_stderr_target, "DMAIN,1:DDB,1:DAUC,1"); test_gen_vectors_2g_only(); test_gen_vectors_2g_plus_3g(); diff --git a/tests/auc/gen_ts_55_205_test_sets/main_template.c b/tests/auc/gen_ts_55_205_test_sets/main_template.c index e917e71..37f47c3 100644 --- a/tests/auc/gen_ts_55_205_test_sets/main_template.c +++ b/tests/auc/gen_ts_55_205_test_sets/main_template.c @@ -107,6 +107,7 @@ int main() log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); + log_parse_category_mask(osmo_stderr_target, "DMAIN,1:DDB,1:DAUC,1"); FUNCTION_CALLS diff --git a/tests/db/db_test.c b/tests/db/db_test.c index 0a53370..389ed00 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -816,6 +816,7 @@ int main(int argc, char **argv) log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); log_set_print_category(osmo_stderr_target, 1); + log_parse_category_mask(osmo_stderr_target, "DMAIN,1:DDB,1:DAUC,1"); /* omit the SQLite version and compilation flags from test output */ log_set_log_level(osmo_stderr_target, LOGL_ERROR); diff --git a/tests/test_nodes.vty b/tests/test_nodes.vty index 0de4ff4..6de673a 100644 --- a/tests/test_nodes.vty +++ b/tests/test_nodes.vty @@ -101,9 +101,9 @@ log stderr logging print category 1 logging print extended-timestamp 1 logging level all debug - logging level main debug - logging level db debug - logging level auc debug + logging level main notice + logging level db notice + logging level auc notice ... ! line vty |