summaryrefslogtreecommitdiff
path: root/src/daemon/dlt_daemon_common.c
diff options
context:
space:
mode:
authorS. Hameed <shameed@jp.adit-jv.com>2015-07-28 16:26:00 +0900
committerAlexander Wenzel <Alexander.AW.Wenzel@bmw.de>2015-07-30 10:22:17 +0200
commit81d76cfeaa3588069887a19f9be7d4337c567c65 (patch)
tree4e00527db6efd632fc0559e8bcc505c9bcee1b39 /src/daemon/dlt_daemon_common.c
parent4092d77b78cd3b1e6805c4c32d9842de83d23e7f (diff)
downloadDLT-daemon-81d76cfeaa3588069887a19f9be7d4337c567c65.tar.gz
Offline Logstorage [1/4]: DLT preparation to enable offline logstorage
Signed-off-by: S. Hameed <shameed@jp.adit-jv.com>
Diffstat (limited to 'src/daemon/dlt_daemon_common.c')
-rw-r--r--src/daemon/dlt_daemon_common.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c
index ad1256e..2064e94 100644
--- a/src/daemon/dlt_daemon_common.c
+++ b/src/daemon/dlt_daemon_common.c
@@ -217,6 +217,7 @@ int dlt_daemon_init(DltDaemon *daemon,unsigned long RingbufferMinSize,unsigned l
return -1;
}
+ daemon->storage_handle = NULL;
return 0;
}
@@ -1131,8 +1132,15 @@ int dlt_daemon_user_send_log_level(DltDaemon *daemon,DltDaemonContext *context,i
{
return -1;
}
+ if(context->storage_log_level != DLT_LOG_DEFAULT)
+ {
+ usercontext.log_level = context->log_level > context->storage_log_level ? context->log_level:context->storage_log_level;
+ }
+ else /* Storage log level is not updated (is DEFAULT) then no device is yet connected so ignore */
+ {
+ usercontext.log_level = ((context->log_level == DLT_LOG_DEFAULT)?daemon->default_log_level:context->log_level);
+ }
- usercontext.log_level = ((context->log_level == DLT_LOG_DEFAULT)?daemon->default_log_level:context->log_level);
usercontext.trace_status = ((context->trace_status == DLT_TRACE_STATUS_DEFAULT)?daemon->default_trace_status:context->trace_status);
usercontext.log_level_pos = context->log_level_pos;