From: David Lamparter Date: Tue, 13 Apr 2021 21:24:44 +0000 (+0200) Subject: vtysh: add lib/log_vty.c to vtysh_scan X-Git-Tag: frr-8.0.1~261^2~4 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=48843422d3433682d8b14e9224dd71aeb82afb63;p=mirror_frr.git vtysh: add lib/log_vty.c to vtysh_scan Rather than copying everything over, include the file in vtysh_scan for automatic pickup. Signed-off-by: David Lamparter --- diff --git a/lib/log_vty.c b/lib/log_vty.c index c26621ae9..c6788dd35 100644 --- a/lib/log_vty.c +++ b/lib/log_vty.c @@ -146,11 +146,11 @@ void log_show_syslog(struct vty *vty) zlog_progname); } -DEFUN (show_logging, - show_logging_cmd, - "show logging", - SHOW_STR - "Show current logging configuration\n") +DEFUN_NOSH (show_logging, + show_logging_cmd, + "show logging", + SHOW_STR + "Show current logging configuration\n") { log_show_syslog(vty); diff --git a/lib/subdir.am b/lib/subdir.am index 0853d4bb2..978899c6e 100644 --- a/lib/subdir.am +++ b/lib/subdir.am @@ -141,6 +141,7 @@ vtysh_scan += \ lib/if_rmap.c \ lib/keychain.c \ lib/lib_vty.c \ + lib/log_vty.c \ lib/nexthop_group.c \ lib/plist.c \ lib/routemap.c \ diff --git a/vtysh/extract.pl.in b/vtysh/extract.pl.in index 5e2189aad..5719fac84 100755 --- a/vtysh/extract.pl.in +++ b/vtysh/extract.pl.in @@ -103,7 +103,7 @@ sub scan_file { elsif ($file =~ /lib\/(filter|filter_cli)\.c$/) { $protocol = "VTYSH_ACL"; } - elsif ($file =~ /lib\/lib_vty\.c$/) { + elsif ($file =~ /lib\/(lib|log)_vty\.c$/) { $protocol = "VTYSH_ALL"; } elsif ($file =~ /lib\/agentx\.c$/) { diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c index 75fee1d29..a1417430e 100644 --- a/vtysh/vtysh.c +++ b/vtysh/vtysh.c @@ -2964,136 +2964,6 @@ DEFUN (vtysh_show_logging, "Logging configuration for %s:\n"); } -DEFUNSH(VTYSH_ALL, vtysh_log_stdout, vtysh_log_stdout_cmd, "log stdout", - "Logging control\n" - "Set stdout logging level\n") -{ - return CMD_SUCCESS; -} - -DEFUNSH(VTYSH_ALL, vtysh_log_stdout_level, vtysh_log_stdout_level_cmd, - "log stdout ", - "Logging control\n" - "Set stdout logging level\n" LOG_LEVEL_DESC) -{ - return CMD_SUCCESS; -} - -DEFUNSH(VTYSH_ALL, no_vtysh_log_stdout, no_vtysh_log_stdout_cmd, - "no log stdout [LEVEL]", NO_STR - "Logging control\n" - "Cancel logging to stdout\n" - "Logging level\n") -{ - return CMD_SUCCESS; -} - -DEFUNSH(VTYSH_ALL, vtysh_log_file, vtysh_log_file_cmd, "log file FILENAME", - "Logging control\n" - "Logging to file\n" - "Logging filename\n") -{ - return CMD_SUCCESS; -} - -DEFUNSH(VTYSH_ALL, vtysh_log_file_level, vtysh_log_file_level_cmd, - "log file FILENAME ", - "Logging control\n" - "Logging to file\n" - "Logging filename\n" LOG_LEVEL_DESC) -{ - return CMD_SUCCESS; -} - -DEFUNSH(VTYSH_ALL, no_vtysh_log_file, no_vtysh_log_file_cmd, - "no log file [FILENAME [LEVEL]]", NO_STR - "Logging control\n" - "Cancel logging to file\n" - "Logging file name\n" - "Logging level\n") -{ - return CMD_SUCCESS; -} - -DEFUNSH(VTYSH_ALL, vtysh_log_monitor, vtysh_log_monitor_cmd, - "log monitor []", - "Logging control\n" - "Set terminal line (monitor) logging level\n" LOG_LEVEL_DESC) -{ - return CMD_SUCCESS; -} - -DEFUNSH(VTYSH_ALL, no_vtysh_log_monitor, no_vtysh_log_monitor_cmd, - "no log monitor [LEVEL]", NO_STR - "Logging control\n" - "Disable terminal line (monitor) logging\n" - "Logging level\n") -{ - return CMD_SUCCESS; -} - -DEFUNSH(VTYSH_ALL, vtysh_log_syslog, vtysh_log_syslog_cmd, - "log syslog []", - "Logging control\n" - "Set syslog logging level\n" LOG_LEVEL_DESC) -{ - return CMD_SUCCESS; -} - -DEFUNSH(VTYSH_ALL, no_vtysh_log_syslog, no_vtysh_log_syslog_cmd, - "no log syslog []", - NO_STR - "Logging control\n" - "Cancel logging to syslog\n" - LOG_LEVEL_DESC) -{ - return CMD_SUCCESS; -} - -DEFUNSH(VTYSH_ALL, vtysh_log_facility, vtysh_log_facility_cmd, - "log facility ", - "Logging control\n" - "Facility parameter for syslog messages\n" LOG_FACILITY_DESC) -{ - return CMD_SUCCESS; -} - -DEFUNSH(VTYSH_ALL, no_vtysh_log_facility, no_vtysh_log_facility_cmd, - "no log facility []", - NO_STR - "Logging control\n" - "Reset syslog facility to default (daemon)\n" - LOG_FACILITY_DESC) -{ - return CMD_SUCCESS; -} - -DEFUNSH(VTYSH_ALL, vtysh_log_record_priority, vtysh_log_record_priority_cmd, - "log record-priority", - "Logging control\n" - "Log the priority of the message within the message\n") -{ - return CMD_SUCCESS; -} - -DEFUNSH(VTYSH_ALL, no_vtysh_log_record_priority, - no_vtysh_log_record_priority_cmd, "no log record-priority", NO_STR - "Logging control\n" - "Do not log the priority of the message within the message\n") -{ - return CMD_SUCCESS; -} - -DEFUNSH(VTYSH_ALL, vtysh_log_timestamp_precision, - vtysh_log_timestamp_precision_cmd, "log timestamp precision (0-6)", - "Logging control\n" - "Timestamp configuration\n" - "Set the timestamp precision\n" - "Number of subsecond digits\n") -{ - return CMD_SUCCESS; -} - DEFUNSH(VTYSH_ALL, vtysh_debug_memstats, vtysh_debug_memstats_cmd, "[no] debug memstats-at-exit", NO_STR @@ -3103,16 +2973,6 @@ DEFUNSH(VTYSH_ALL, vtysh_debug_memstats, return CMD_SUCCESS; } -DEFUNSH(VTYSH_ALL, no_vtysh_log_timestamp_precision, - no_vtysh_log_timestamp_precision_cmd, "no log timestamp precision", - NO_STR - "Logging control\n" - "Timestamp configuration\n" - "Reset the timestamp precision to the default value of 0\n") -{ - return CMD_SUCCESS; -} - DEFUNSH(VTYSH_ALL, vtysh_service_password_encrypt, vtysh_service_password_encrypt_cmd, "service password-encryption", "Set up miscellaneous service\n" @@ -4605,22 +4465,6 @@ void vtysh_init_vty(void) /* Logging */ install_element(VIEW_NODE, &vtysh_show_logging_cmd); - install_element(CONFIG_NODE, &vtysh_log_stdout_cmd); - install_element(CONFIG_NODE, &vtysh_log_stdout_level_cmd); - install_element(CONFIG_NODE, &no_vtysh_log_stdout_cmd); - install_element(CONFIG_NODE, &vtysh_log_file_cmd); - install_element(CONFIG_NODE, &vtysh_log_file_level_cmd); - install_element(CONFIG_NODE, &no_vtysh_log_file_cmd); - install_element(CONFIG_NODE, &vtysh_log_monitor_cmd); - install_element(CONFIG_NODE, &no_vtysh_log_monitor_cmd); - install_element(CONFIG_NODE, &vtysh_log_syslog_cmd); - install_element(CONFIG_NODE, &no_vtysh_log_syslog_cmd); - install_element(CONFIG_NODE, &vtysh_log_facility_cmd); - install_element(CONFIG_NODE, &no_vtysh_log_facility_cmd); - install_element(CONFIG_NODE, &vtysh_log_record_priority_cmd); - install_element(CONFIG_NODE, &no_vtysh_log_record_priority_cmd); - install_element(CONFIG_NODE, &vtysh_log_timestamp_precision_cmd); - install_element(CONFIG_NODE, &no_vtysh_log_timestamp_precision_cmd); install_element(CONFIG_NODE, &vtysh_service_password_encrypt_cmd); install_element(CONFIG_NODE, &no_vtysh_service_password_encrypt_cmd);