summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author童宗振 <[email protected]>2024-04-29 09:12:55 +0000
committer童宗振 <[email protected]>2024-04-29 09:12:55 +0000
commitd56af082055fee1276efd2ad89cc1a143cf95eb3 (patch)
tree92ba41b7827b321c2ef9e00099d010cd89e56da1
parentb6031713bd40bfd98ee6e1e186082735b1bc63fd (diff)
parentfe29d3a4c1db09bceef6537e01419856df676ab4 (diff)
Merge branch 'adjust_code_for_cli' into 'master'v0.1.6-20240429
Adjust code for cli See merge request tsg/dp_telemetry_app!24
-rw-r--r--src/maat.c10
-rw-r--r--src/main.c4
2 files changed, 8 insertions, 6 deletions
diff --git a/src/maat.c b/src/maat.c
index 5c464cc..e0b4ea1 100644
--- a/src/maat.c
+++ b/src/maat.c
@@ -18,13 +18,15 @@ static struct maat * dp_trace_maat_instance_create()
maat_options_set_logger(opts, "log/maat.log", (enum log_level)conf->maat_log_level);
maat_options_set_instance_name(opts, "dp_trace_telemetry");
-#if 0
+ dzlog_info("maat defere load:%u", conf->deferred_load_on);
if (conf->deferred_load_on)
{
- maat_options_set_deferred_load_on(opts);
+ ret = maat_options_set_deferred_load_on(opts);
+ if (ret != 0)
+ {
+ dzlog_warn("maat_options_set_deferred_load_on function execution failed.");
+ }
}
- dzlog_info("maat defere load on:%u", conf->deferred_load_on);
-#endif
maat_options_set_caller_thread_number(opts, 0);
switch (conf->maat_input_mode)
diff --git a/src/main.c b/src/main.c
index 8374821..ee607b8 100644
--- a/src/main.c
+++ b/src/main.c
@@ -134,6 +134,8 @@ int main(int argc, char * argv[])
}
zlog_env_is_init = 1;
+ http_serv_init();
+
dp_trace_output_init();
mr_instance = marsio_create();
@@ -165,8 +167,6 @@ int main(int argc, char * argv[])
pthread_create(&tmp_pid[i], NULL, dp_trace_process_thread, (void *)(uintptr_t)i);
}
- http_serv_init();
-
for (int i = 0; i < nr_thread; i++)
{
pthread_join(tmp_pid[i], NULL);