From 2ef086bd9befd64ac14e3f8b4e0b7bf303a1ec2a Mon Sep 17 00:00:00 2001 From: yuusuke Date: Fri, 11 Sep 2015 17:03:01 +0900 Subject: [PATCH] wd: Warn if values are out of range Signed-off-by: yuusuke Reviewed-by: Christine Caulfield --- exec/wd.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/exec/wd.c b/exec/wd.c index feb049e5..92132646 100644 --- a/exec/wd.c +++ b/exec/wd.c @@ -690,11 +690,13 @@ static void wd_top_level_key_changed( if (icmap_get_uint32("resources.watchdog_timeout", &tmp_value_32) == CS_OK) { if (tmp_value_32 >= 2 && tmp_value_32 <= 120) { watchdog_timeout_apply (tmp_value_32); + return; } } - else { - watchdog_timeout_apply (WD_DEFAULT_TIMEOUT_SEC); - } + + log_printf (LOGSYS_LEVEL_WARNING, + "Set watchdog_timeout is out of range (2..120)."); + icmap_set_uint32("resources.watchdog_timeout", watchdog_timeout); } static void watchdog_timeout_get_initial (void) @@ -712,8 +714,14 @@ static void watchdog_timeout_get_initial (void) else { if (tmp_value_32 >= 2 && tmp_value_32 <= 120) { watchdog_timeout_apply (tmp_value_32); - } else { + } + else { + log_printf (LOGSYS_LEVEL_WARNING, + "Set watchdog_timeout is out of range (2..120)."); + log_printf (LOGSYS_LEVEL_INFO, + "use default value %d seconds.", WD_DEFAULT_TIMEOUT_SEC); watchdog_timeout_apply (WD_DEFAULT_TIMEOUT_SEC); + icmap_set_uint32("resources.watchdog_timeout", watchdog_timeout); } }