]> git.puffer.fish Git - matthieu/frr.git/commitdiff
lib: Allow unsetting walltime-warning and cpu-warning
authorDonatas Abraitis <donatas@opensourcerouting.org>
Fri, 11 Aug 2023 15:11:03 +0000 (18:11 +0300)
committerDonatas Abraitis <donatas@opensourcerouting.org>
Wed, 16 Aug 2023 04:29:46 +0000 (07:29 +0300)
With a negative form we get:

```
Internal CLI error [walltime_warning_str]
Internal CLI error [cputime_warning_str]
```

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
lib/thread.c

index 9eac9b410a4a76d08229b8761b6c9653da26bc4d..4e21dafe1f0a1442233b435ab25929d711f56066 100644 (file)
@@ -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);
 }