diff options
author | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-04-17 15:07:06 +0200 |
---|---|---|
committer | Pau Espin Pedrol <pespin@sysmocom.de> | 2018-04-17 15:07:06 +0200 |
commit | 51530311a8a3edbf2518413a805eb0a9f111f756 (patch) | |
tree | 841b99c10b5ba1d78653e7e07baae4daed33893b | |
parent | f162252a087c29104cab4e1f2bdf609b3362aaa6 (diff) |
use osmo_init_logging2
Change-Id: If4449cce1af46be22cc370abd3a6da8e22a31fa5
-rw-r--r-- | src/db_test.c | 2 | ||||
-rw-r--r-- | src/hlr.c | 2 | ||||
-rw-r--r-- | src/hlr_db_tool.c | 2 | ||||
-rw-r--r-- | tests/auc/auc_test.c | 4 | ||||
-rw-r--r-- | tests/auc/gen_ts_55_205_test_sets/main_template.c | 5 | ||||
-rw-r--r-- | tests/db/db_test.c | 2 |
6 files changed, 11 insertions, 6 deletions
diff --git a/src/db_test.c b/src/db_test.c index 7891c90..0d10797 100644 --- a/src/db_test.c +++ b/src/db_test.c @@ -49,7 +49,7 @@ int main(int argc, char **argv) g_hlr = talloc_zero(NULL, struct hlr); - rc = osmo_init_logging(&hlr_log_info); + rc = osmo_init_logging2(g_hlr, &hlr_log_info); if (rc < 0) { fprintf(stderr, "Error initializing logging\n"); exit(1); @@ -475,7 +475,7 @@ int main(int argc, char **argv) g_hlr = talloc_zero(hlr_ctx, struct hlr); - rc = osmo_init_logging(&hlr_log_info); + rc = osmo_init_logging2(hlr_ctx, &hlr_log_info); if (rc < 0) { fprintf(stderr, "Error initializing logging\n"); exit(1); diff --git a/src/hlr_db_tool.c b/src/hlr_db_tool.c index 318308c..e83b098 100644 --- a/src/hlr_db_tool.c +++ b/src/hlr_db_tool.c @@ -386,7 +386,7 @@ int main(int argc, char **argv) OSMO_ASSERT(g_hlr_db_tool_ctx); talloc_set_name_const(g_hlr_db_tool_ctx, "OsmoHLR-db-tool"); - rc = osmo_init_logging(&hlr_log_info); + rc = osmo_init_logging2(g_hlr_db_tool_ctx, &hlr_log_info); if (rc < 0) { fprintf(stderr, "Error initializing logging\n"); exit(EXIT_FAILURE); diff --git a/tests/auc/auc_test.c b/tests/auc/auc_test.c index e9c114c..e23cc02 100644 --- a/tests/auc/auc_test.c +++ b/tests/auc/auc_test.c @@ -610,7 +610,9 @@ int main(int argc, char **argv) handle_options(argc, argv); - osmo_init_logging(&hlr_log_info); + void *tall_ctx = talloc_named_const(NULL, 1, "auc_test"); + + osmo_init_logging2(tall_ctx, &hlr_log_info); log_set_print_filename(osmo_stderr_target, cmdline_opts.verbose); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); 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 37f47c3..a78bddb 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 @@ -29,6 +29,7 @@ #include <osmocom/core/application.h> #include <osmocom/core/utils.h> #include <osmocom/core/logging.h> +#include <osmocom/core/msgb.h> #include <osmocom/crypt/auth.h> @@ -102,7 +103,9 @@ FUNCTIONS int main() { printf("3GPP TS 55.205 Test Sets\n"); - osmo_init_logging(&hlr_log_info); + void *tall_ctx = talloc_named_const(NULL, 1, "test"); + msgb_talloc_ctx_init(tall_ctx, 0); + osmo_init_logging2(tall_ctx, &hlr_log_info); log_set_print_filename(osmo_stderr_target, 0); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); diff --git a/tests/db/db_test.c b/tests/db/db_test.c index 6bf7a86..058588b 100644 --- a/tests/db/db_test.c +++ b/tests/db/db_test.c @@ -839,7 +839,7 @@ int main(int argc, char **argv) handle_options(argc, argv); - osmo_init_logging(&hlr_log_info); + osmo_init_logging2(ctx, &hlr_log_info); log_set_print_filename(osmo_stderr_target, cmdline_opts.verbose); log_set_print_timestamp(osmo_stderr_target, 0); log_set_use_color(osmo_stderr_target, 0); |