diff options
| author | Bui Nguyen Quoc Thanh <thanh.buinguyenquoc@vn.bosch.com> | 2020-10-26 16:28:00 +0700 |
|---|---|---|
| committer | Saya Sugiura <39760799+ssugiura@users.noreply.github.com> | 2021-01-06 09:27:28 +0900 |
| commit | 4eb5be749b23081d2c92680d2a481e36f7ac0685 (patch) | |
| tree | ee8a41dd31baa4136e1685082c598f41f0bef2c1 /src/daemon/dlt-daemon.c | |
| parent | 1bbccc2bb07109007fecaf8007a6552d056edb66 (diff) | |
| download | DLT-daemon-4eb5be749b23081d2c92680d2a481e36f7ac0685.tar.gz | |
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 <thanh.buinguyenquoc@vn.bosch.com>
Diffstat (limited to 'src/daemon/dlt-daemon.c')
| -rw-r--r-- | src/daemon/dlt-daemon.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c index 64135bd..775d3a9 100644 --- a/src/daemon/dlt-daemon.c +++ b/src/daemon/dlt-daemon.c @@ -952,7 +952,7 @@ int main(int argc, char *argv[]) /* --- Daemon connection init end */ - if (dlt_daemon_load_runtime_configuration(&daemon, daemon_local.flags.ivalue, daemon_local.flags.vflag) == -1) { + if (dlt_daemon_init_runtime_configuration(&daemon, daemon_local.flags.ivalue, daemon_local.flags.vflag) == -1) { dlt_log(LOG_ERR, "Could not load runtime config\n"); return -1; } @@ -965,6 +965,12 @@ int main(int argc, char *argv[]) /* --- Daemon init phase 2 end --- */ + /* + * Load dlt-runtime.cfg if available. + * This must be loaded before offline setup + */ + dlt_daemon_configuration_load(&daemon, daemon.runtime_configuration, daemon_local.flags.vflag); + if (daemon_local.flags.offlineLogstorageDirPath[0]) if (dlt_daemon_logstorage_setup_internal_storage( &daemon, @@ -1028,6 +1034,16 @@ int main(int argc, char *argv[]) daemon_local.flags.gatewayMode, daemon_local.flags.vflag); + /* + * Check for app and ctx runtime cfg. + * These cfg must be loaded after ecuId and num_user_lists are available + */ + if ((dlt_daemon_applications_load(&daemon, daemon.runtime_application_cfg, + daemon_local.flags.vflag) == 0) && + (dlt_daemon_contexts_load(&daemon, daemon.runtime_context_cfg, + daemon_local.flags.vflag) == 0)) + daemon.runtime_context_cfg_loaded = 1; + dlt_daemon_log_internal(&daemon, &daemon_local, "Daemon launched. Starting to output traces...", |