diff options
| author | Brian Rak <brianrak@gameservers.com> | 2017-11-15 20:51:37 +0100 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-12-04 15:55:39 +0100 |
| commit | 0a64aff60c6fb84abf44fcd323f9f9acefce2d01 (patch) | |
| tree | 1c3a03e86c7e1f7e642252ab6324f048f7952de5 | |
| parent | Merge pull request #1500 from opensourcerouting/ldpd-fixes (diff) | |
| download | frr-0a64aff60c6fb84abf44fcd323f9f9acefce2d01.tar.xz frr-0a64aff60c6fb84abf44fcd323f9f9acefce2d01.zip | |
tools, watchfrr: Modify timeout to 90 seconds
The default timeout of 10 seconds is too quick of a timeout
given some long running cli commands. Modify watchfrr
to have a 90s timeout value instead.
Signed-off-by: Brian Rak <brianrak@gameservers.com>
| -rw-r--r-- | tools/etc/frr/daemons.conf | 2 | ||||
| -rw-r--r-- | watchfrr/watchfrr.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/etc/frr/daemons.conf b/tools/etc/frr/daemons.conf index 3f40836c9..783d16731 100644 --- a/tools/etc/frr/daemons.conf +++ b/tools/etc/frr/daemons.conf @@ -20,7 +20,7 @@ sharpd_options=" --daemon -A 127.0.0.1" # The list of daemons to watch is automatically generated by the init script. watchfrr_enable=yes -watchfrr_options=(-d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB -t 30) +watchfrr_options=(-d -r /usr/sbin/servicebBfrrbBrestartbB%s -s /usr/sbin/servicebBfrrbBstartbB%s -k /usr/sbin/servicebBfrrbBstopbB%s -b bB) # If valgrind_enable is 'yes' the frr daemons will be started via valgrind. # The use case for doing so is tracking down memory leaks, etc in frr. diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c index c9f721eac..33106bdf1 100644 --- a/watchfrr/watchfrr.c +++ b/watchfrr/watchfrr.c @@ -45,7 +45,7 @@ #define FUZZY(X) ((X)+JITTER((X)/20)) #define DEFAULT_PERIOD 5 -#define DEFAULT_TIMEOUT 10 +#define DEFAULT_TIMEOUT 90 #define DEFAULT_RESTART_TIMEOUT 20 #define DEFAULT_LOGLEVEL LOG_INFO #define DEFAULT_MIN_RESTART 60 |