summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLassi Marttala <lassi.lm.marttala@partner.bmw.de>2012-05-22 08:04:13 +0200
committerChristian Muck <christian.muck@bmw.de>2012-05-30 09:05:28 +0200
commit7db06b366977808e31f62ca341d59d667851ecec (patch)
tree1c849949478ce4b7fb2235f3cfd0e6eaac097f59
parent6fbb864ec02f289e31b024f010ba1e151504c839 (diff)
downloadDLT-daemon-7db06b366977808e31f62ca341d59d667851ecec.tar.gz
[GDLT-88] Fixed wrong initalization order using offline trace functionality
Signed-off-by: Christian Muck <christian.muck@bmw.de>
-rw-r--r--src/daemon/dlt-daemon.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c
index 609c192..6aa4a07 100644
--- a/src/daemon/dlt-daemon.c
+++ b/src/daemon/dlt-daemon.c
@@ -534,16 +534,6 @@ int dlt_daemon_local_init_p1(DltDaemon *daemon, DltDaemonLocal *daemon_local, in
signal(SIGHUP, dlt_daemon_signal_handler); /* hangup signal */
signal(SIGQUIT, dlt_daemon_signal_handler);
signal(SIGINT, dlt_daemon_signal_handler);
-
- /* init offline trace */
- if(((daemon->mode == DLT_USER_MODE_INTERNAL) || (daemon->mode == DLT_USER_MODE_BOTH)) && daemon_local->flags.offlineTraceDirectory[0])
- {
- if (dlt_offline_trace_init(&(daemon_local->offlineTrace),daemon_local->flags.offlineTraceDirectory,daemon_local->flags.offlineTraceFileSize,daemon_local->flags.offlineTraceMaxSize)==-1)
- {
- dlt_log(LOG_ERR,"Could not initialize offline trace\n");
- return -1;
- }
- }
return 0;
}
@@ -565,6 +555,16 @@ int dlt_daemon_local_init_p2(DltDaemon *daemon, DltDaemonLocal *daemon_local, in
return -1;
}
+ /* init offline trace */
+ if(((daemon->mode == DLT_USER_MODE_INTERNAL) || (daemon->mode == DLT_USER_MODE_BOTH)) && daemon_local->flags.offlineTraceDirectory[0])
+ {
+ if (dlt_offline_trace_init(&(daemon_local->offlineTrace),daemon_local->flags.offlineTraceDirectory,daemon_local->flags.offlineTraceFileSize,daemon_local->flags.offlineTraceMaxSize)==-1)
+ {
+ dlt_log(LOG_ERR,"Could not initialize offline trace\n");
+ return -1;
+ }
+ }
+
/* Set ECU id of daemon */
if (daemon_local->flags.evalue[0])
{