summaryrefslogtreecommitdiff
path: root/src/daemon/dlt_daemon_common.c
diff options
context:
space:
mode:
authorSebastian Kloska <sebastian.kloska@snafu.de>2019-10-10 13:05:26 +0200
committerSaya Sugiura <39760799+ssugiura@users.noreply.github.com>2019-10-10 23:27:31 +0900
commitda36b5b4fe7a25da4a272618db67601c0f6e3d3a (patch)
treed49b526a8fa24f1298eb7b7c50f867192a85bd6b /src/daemon/dlt_daemon_common.c
parentdb669dda273b31215a6b002fd7c753f394649369 (diff)
downloadDLT-daemon-da36b5b4fe7a25da4a272618db67601c0f6e3d3a.tar.gz
Fix: Propper usage of LoggingMode in ".../dlt-runtime.cfg"
* Symptom: no offline trace file gets created even if runtime config LoggingMode==(2|3). * Reason: runtime config gets read *after* offline logging setup. * Solution: Read runtime config *before* offline logging setup. * Make the "read runtime config" function set a proper default value for logging mode instead if the *_init_* function setting up the logging. Signed-off-by: Sebastian Kloska <sebastian.kloska@snafu.de>
Diffstat (limited to 'src/daemon/dlt_daemon_common.c')
-rw-r--r--src/daemon/dlt_daemon_common.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c
index 2bf6647..49716c4 100644
--- a/src/daemon/dlt_daemon_common.c
+++ b/src/daemon/dlt_daemon_common.c
@@ -145,7 +145,13 @@ int dlt_daemon_load_runtime_configuration(DltDaemon *daemon, const char *runtime
{
int append_length = 0;
- if ((daemon == NULL) || (runtime_directory == NULL))
+ if ( daemon == NULL )
+ return DLT_RETURN_ERROR;
+
+ // Default
+ daemon->mode = DLT_USER_MODE_EXTERNAL;
+
+ if ( runtime_directory == NULL )
return DLT_RETURN_ERROR;
/* prepare filenames for configuration */
@@ -225,8 +231,6 @@ int dlt_daemon_init(DltDaemon *daemon,
daemon->runtime_context_cfg_loaded = 0;
- daemon->mode = DLT_USER_MODE_EXTERNAL;
-
daemon->connectionState = 0; /* no logger connected */
daemon->state = DLT_DAEMON_STATE_INIT; /* initial logging state */