Merge pull request #14618 from donaldsharp/watchfrr_extend

watchfrr: Extend ignore option to daemon being killed
FRRouting · Oct 19, 2023 · 2775d22 · 2775d22
2 parents 8f83935 + c168244
commit 2775d22
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c
@@ -600,6 +600,9 @@ static void daemon_restarting_operational(struct event *thread)
 
 static void daemon_down(struct daemon *dmn, const char *why)
 {
+	if (dmn->ignore_timeout)
+		return;
+
 	if (IS_UP(dmn) || (dmn->state == DAEMON_INIT))
 		flog_err(EC_WATCHFRR_CONNECTION, "%s state -> down : %s",
 			 dmn->name, why);