From: Donatas Abraitis Date: Fri, 11 Aug 2023 15:11:03 +0000 (+0300) Subject: lib: Allow unsetting walltime-warning and cpu-warning X-Git-Tag: docker/8.4.5~25^2~1 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=021aa58871a90d5795fd4c8108cb4567fe06f77f;p=matthieu%2Ffrr.git lib: Allow unsetting walltime-warning and cpu-warning With a negative form we get: ``` Internal CLI error [walltime_warning_str] Internal CLI error [cputime_warning_str] ``` Signed-off-by: Donatas Abraitis --- diff --git a/lib/thread.c b/lib/thread.c index 9eac9b410a..4e21dafe1f 100644 --- a/lib/thread.c +++ b/lib/thread.c @@ -370,7 +370,7 @@ DEFPY (service_cputime_stats, DEFPY (service_cputime_warning, service_cputime_warning_cmd, - "[no] service cputime-warning (1-4294967295)", + "[no] service cputime-warning ![(1-4294967295)]", NO_STR "Set up miscellaneous service\n" "Warn for tasks exceeding CPU usage threshold\n" @@ -383,16 +383,9 @@ DEFPY (service_cputime_warning, return CMD_SUCCESS; } -ALIAS (service_cputime_warning, - no_service_cputime_warning_cmd, - "no service cputime-warning", - NO_STR - "Set up miscellaneous service\n" - "Warn for tasks exceeding CPU usage threshold\n") - DEFPY (service_walltime_warning, service_walltime_warning_cmd, - "[no] service walltime-warning (1-4294967295)", + "[no] service walltime-warning ![(1-4294967295)]", NO_STR "Set up miscellaneous service\n" "Warn for tasks exceeding total wallclock threshold\n" @@ -405,13 +398,6 @@ DEFPY (service_walltime_warning, return CMD_SUCCESS; } -ALIAS (service_walltime_warning, - no_service_walltime_warning_cmd, - "no service walltime-warning", - NO_STR - "Set up miscellaneous service\n" - "Warn for tasks exceeding total wallclock threshold\n") - static void show_thread_poll_helper(struct vty *vty, struct thread_master *m) { const char *name = m->name ? m->name : "main"; @@ -541,9 +527,7 @@ void thread_cmd_init(void) install_element(CONFIG_NODE, &service_cputime_stats_cmd); install_element(CONFIG_NODE, &service_cputime_warning_cmd); - install_element(CONFIG_NODE, &no_service_cputime_warning_cmd); install_element(CONFIG_NODE, &service_walltime_warning_cmd); - install_element(CONFIG_NODE, &no_service_walltime_warning_cmd); install_element(VIEW_NODE, &show_thread_timers_cmd); }