Merge pull request #14618 from donaldsharp/watchfrr_extend

watchfrr: Extend ignore option to daemon being killed
This commit is contained in:
Donatas Abraitis 2023-10-19 18:48:37 +03:00 committed by GitHub
commit 2775d2263a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -600,6 +600,9 @@ static void daemon_restarting_operational(struct event *thread)
static void daemon_down(struct daemon *dmn, const char *why) static void daemon_down(struct daemon *dmn, const char *why)
{ {
if (dmn->ignore_timeout)
return;
if (IS_UP(dmn) || (dmn->state == DAEMON_INIT)) if (IS_UP(dmn) || (dmn->state == DAEMON_INIT))
flog_err(EC_WATCHFRR_CONNECTION, "%s state -> down : %s", flog_err(EC_WATCHFRR_CONNECTION, "%s state -> down : %s",
dmn->name, why); dmn->name, why);