From 4eb5be749b23081d2c92680d2a481e36f7ac0685 Mon Sep 17 00:00:00 2001 From: Bui Nguyen Quoc Thanh Date: Mon, 26 Oct 2020 16:28:00 +0700 Subject: daemon: Correct order of runtime config load. Since order of runtime config load for app-ctx and dlt-runtime are different from each other, so they could not be in the same load_runtime function. Signed-off-by: Bui Nguyen Quoc Thanh --- src/daemon/dlt_daemon_common.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/daemon/dlt_daemon_common.c') diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c index 4349753..cff1a9e 100644 --- a/src/daemon/dlt_daemon_common.c +++ b/src/daemon/dlt_daemon_common.c @@ -140,8 +140,9 @@ DltDaemonRegisteredUsers *dlt_daemon_find_users_list(DltDaemon *daemon, dlt_vlog(LOG_ERR, "Cannot find user list for ECU: %4s\n", ecu); return (DltDaemonRegisteredUsers *)NULL; } -int dlt_daemon_load_runtime_configuration(DltDaemon *daemon, const char *runtime_directory, int verbose) +int dlt_daemon_init_runtime_configuration(DltDaemon *daemon, const char *runtime_directory, int verbose) { + PRINT_FUNCTION_VERBOSE(verbose); int append_length = 0; if (daemon == NULL) @@ -193,14 +194,6 @@ int dlt_daemon_load_runtime_configuration(DltDaemon *daemon, const char *runtime strcat(daemon->runtime_configuration, DLT_RUNTIME_CONFIGURATION); /* strcat uncritical here, because max length already checked */ - /* Check for runtime cfg, if it is loadable, load it! */ - if ((dlt_daemon_applications_load(daemon, daemon->runtime_application_cfg, verbose) == 0) && - (dlt_daemon_contexts_load(daemon, daemon->runtime_context_cfg, verbose) == 0)) - daemon->runtime_context_cfg_loaded = 1; - - /* load configuration if available */ - dlt_daemon_configuration_load(daemon, daemon->runtime_configuration, verbose); - return DLT_RETURN_OK; } -- cgit v1.2.1