summaryrefslogtreecommitdiff
path: root/src/system
diff options
context:
space:
mode:
authorChristian Muck <christian.muck@bmw.de>2012-06-05 20:42:36 +0200
committerChristian Muck <christian.muck@bmw.de>2012-06-13 23:53:24 +0200
commit5be08ef4741ced129bf5b150d5ac0d9943b10175 (patch)
treef9fc9ceb69565405161e278dc8a1ea7bc9280ac8 /src/system
parent8fc9c8b59cfde03330fab649a5a084b8c95c08ed (diff)
downloadDLT-daemon-5be08ef4741ced129bf5b150d5ac0d9943b10175.tar.gz
Preparation of config files for release
Signed-off-by: Christian Muck <christian.muck@bmw.de>
Diffstat (limited to 'src/system')
-rw-r--r--src/system/dlt-system-watchdog.c7
-rw-r--r--src/system/dlt-system.conf2
2 files changed, 7 insertions, 2 deletions
diff --git a/src/system/dlt-system-watchdog.c b/src/system/dlt-system-watchdog.c
index c764978..5eef59b 100644
--- a/src/system/dlt-system-watchdog.c
+++ b/src/system/dlt-system-watchdog.c
@@ -40,14 +40,17 @@
** TO BE CHANGED BY USER [yes/no]: no **
** **
*******************************************************************************/
+#if defined(DLT_SYSTEMD_WATCHDOG_ENABLE)
#include <stdio.h>
#include <stdlib.h>
#include <pthread.h>
#include <sys/timerfd.h>
#include "dlt.h"
-#include "sd-daemon.h"
#include "dlt-system.h"
+#include "sd-daemon.h"
+
+
DLT_DECLARE_CONTEXT(watchdogContext)
DLT_IMPORT_CONTEXT(dltsystem)
@@ -109,6 +112,7 @@ int make_periodic(unsigned int period, PeriodicData *info)
return timerfd_settime (fd, 0, &itval, NULL);
}
+
void watchdog_thread(void *v_conf)
{
char str[512];
@@ -195,3 +199,4 @@ void start_systemd_watchdog(DltSystemConfiguration *conf)
DLT_LOG(dltsystem, DLT_LOG_ERROR,DLT_STRING("Could not create thread for systemd watchdog\n"));
}
}
+#endif
diff --git a/src/system/dlt-system.conf b/src/system/dlt-system.conf
index ee237a2..c7313eb 100644
--- a/src/system/dlt-system.conf
+++ b/src/system/dlt-system.conf
@@ -13,7 +13,7 @@ ApplicationId = SYS
########################################################################
# Enable the Syslog Adapter (Default: 0)
-SyslogEnable = 1
+SyslogEnable = 0
# The Context Id of the syslog adapter (Default: SYSL)
SyslogContextId = SYSL