From 31dc3a44e5da9df146b8a016497f2d89c4b73d56 Mon Sep 17 00:00:00 2001 From: christian mueller Date: Tue, 26 Jun 2012 10:57:47 +0200 Subject: * [GAM-24] turn watchdog feature off by default. Signed-off-by: christian mueller --- AudioManagerDaemon/src/CAmWatchdog.cpp | 8 +++++++- CMakeLists.txt | 4 ++-- 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 -- cgit v1.2.1