diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2023-09-27 06:32:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-27 06:32:11 -0400 |
| commit | bb308b1efc2e902c96ffe047bc6394a8da3a16d3 (patch) | |
| tree | fcf55607dc05291590e51683646fc8c3b278fdb2 /lib/command.c | |
| parent | f289533d5d6535b4aad3624e7b912e766ac0b78a (diff) | |
| parent | fd0fe0bb6adf2370256025b17a75c0061c1a977b (diff) | |
Merge pull request #14482 from opensourcerouting/fix/walltime_threshold_disable
lib: Drop deprecated enable-time-check, enable-cpu-time compile options
Diffstat (limited to 'lib/command.c')
| -rw-r--r-- | lib/command.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/lib/command.c b/lib/command.c index affb551b45..1977dc4fae 100644 --- a/lib/command.c +++ b/lib/command.c @@ -477,33 +477,18 @@ static int config_write_host(struct vty *vty) } log_config_write(vty); - /* print disable always, but enable only if default is flipped - * => prep for future removal of compile-time knob - */ if (!cputime_enabled) vty_out(vty, "no service cputime-stats\n"); -#ifdef EXCLUDE_CPU_TIME - else - vty_out(vty, "service cputime-stats\n"); -#endif if (!cputime_threshold) vty_out(vty, "no service cputime-warning\n"); -#if defined(CONSUMED_TIME_CHECK) && CONSUMED_TIME_CHECK != 5000000 - else /* again, always print non-default */ -#else - else if (cputime_threshold != 5000000) -#endif + else if (cputime_threshold != CONSUMED_TIME_CHECK) vty_out(vty, "service cputime-warning %lu\n", cputime_threshold / 1000); if (!walltime_threshold) vty_out(vty, "no service walltime-warning\n"); -#if defined(CONSUMED_TIME_CHECK) && CONSUMED_TIME_CHECK != 5000000 - else /* again, always print non-default */ -#else - else if (walltime_threshold != 5000000) -#endif + else if (walltime_threshold != CONSUMED_TIME_CHECK) vty_out(vty, "service walltime-warning %lu\n", walltime_threshold / 1000); |