summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchristian mueller <christian.ei.mueller@bmw.de>2012-06-26 10:57:47 +0200
committerchristian mueller <christian.ei.mueller@bmw.de>2012-06-26 10:57:47 +0200
commit31dc3a44e5da9df146b8a016497f2d89c4b73d56 (patch)
treede7d311c901a7802c3de5b00ce64c8cfc8e661b9
parent96ab9ddc9098ef02efac70a73ed32f288e8185e2 (diff)
downloadaudiomanager-31dc3a44e5da9df146b8a016497f2d89c4b73d56.tar.gz
* [GAM-24] turn watchdog feature off by default.
Signed-off-by: christian mueller <christian.ei.mueller@bmw.de>
-rwxr-xr-xAudioManagerDaemon/src/CAmWatchdog.cpp8
-rwxr-xr-xCMakeLists.txt4
2 files changed, 9 insertions, 3 deletions
diff --git a/AudioManagerDaemon/src/CAmWatchdog.cpp b/AudioManagerDaemon/src/CAmWatchdog.cpp
index 61e0624..15c7dcc 100755
--- a/AudioManagerDaemon/src/CAmWatchdog.cpp
+++ b/AudioManagerDaemon/src/CAmWatchdog.cpp
@@ -42,8 +42,14 @@ CAmWatchdog::CAmWatchdog(CAmSocketHandler* CAmSocketHandler) :
{
assert(mpCAmSocketHandler);
+
//first retrieve the timeout interval
- int watchdogTimeout = atoi(getenv("WATCHDOG_USEC"));
+
+ int watchdogTimeout = 0;
+
+ char* wusec=getenv("WATCHDOG_USEC");
+ if (wusec)
+ watchdogTimeout=atoi(wusec);
if (watchdogTimeout > 0)
{
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ec4328..b4c30bf 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,7 +71,7 @@ OPTION( WITH_TELNET
"build with Telnetserver (can only work with SocketHandler)" ON)
OPTION ( WITH_SYSTEMD_WATCHDOG
- "build with systemD support & watchdog" ON)
+ "build with systemD support & watchdog" OFF)
OPTION ( USE_BUILD_LIBS
"build with default library path = build path" ON)
@@ -163,7 +163,7 @@ if(WITH_MAIN)
endif(WITH_MAIN)
IF(EXISTS "${CMAKE_SOURCE_DIR}/ProjectSpecific/")
- add_subdirectory (ProjectSpecific)
+ #add_subdirectory (ProjectSpecific)
endif(EXISTS "${CMAKE_SOURCE_DIR}/ProjectSpecific/")
# uninstall target