From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Fri, 1 Jun 2018 20:31:48 +0000 (+0000)
Subject: *: remove deprecated 'log trap' commands
X-Git-Tag: frr-6.1-dev~251^2~2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=20d8a284136c26b59151d6a0f160c00e112673f6;p=matthieu%2Ffrr.git

*: remove deprecated 'log trap' commands

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/lib/command.c b/lib/command.c
index d666e8c593..4d88f295a3 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -515,13 +515,6 @@ static int config_write_host(struct vty *vty)
 					host.enable);
 		}
 
-		if (zlog_default->default_lvl != LOG_DEBUG) {
-			vty_out(vty,
-				"! N.B. The 'log trap' command is deprecated.\n");
-			vty_out(vty, "log trap %s\n",
-				zlog_priority[zlog_default->default_lvl]);
-		}
-
 		if (host.logfile
 		    && (zlog_default->maxlvl[ZLOG_DEST_FILE]
 			!= ZLOG_DISABLED)) {
@@ -2586,36 +2579,6 @@ DEFUN (no_config_log_facility,
 	return CMD_SUCCESS;
 }
 
-DEFUN_DEPRECATED(
-	config_log_trap, config_log_trap_cmd,
-	"log trap <emergencies|alerts|critical|errors|warnings|notifications|informational|debugging>",
-	"Logging control\n"
-	"(Deprecated) Set logging level and default for all destinations\n" LOG_LEVEL_DESC)
-{
-	int new_level;
-	int i;
-
-	if ((new_level = level_match(argv[2]->arg)) == ZLOG_DISABLED)
-		return CMD_ERR_NO_MATCH;
-
-	zlog_default->default_lvl = new_level;
-	for (i = 0; i < ZLOG_NUM_DESTS; i++)
-		if (zlog_default->maxlvl[i] != ZLOG_DISABLED)
-			zlog_default->maxlvl[i] = new_level;
-	return CMD_SUCCESS;
-}
-
-DEFUN_DEPRECATED(
-	no_config_log_trap, no_config_log_trap_cmd,
-	"no log trap [emergencies|alerts|critical|errors|warnings|notifications|informational|debugging]",
-	NO_STR
-	"Logging control\n"
-	"Permit all logging information\n" LOG_LEVEL_DESC)
-{
-	zlog_default->default_lvl = LOG_DEBUG;
-	return CMD_SUCCESS;
-}
-
 DEFUN (config_log_record_priority,
        config_log_record_priority_cmd,
        "log record-priority",
@@ -2905,8 +2868,6 @@ void cmd_init(int terminal)
 		install_element(CONFIG_NODE, &no_config_log_syslog_cmd);
 		install_element(CONFIG_NODE, &config_log_facility_cmd);
 		install_element(CONFIG_NODE, &no_config_log_facility_cmd);
-		install_element(CONFIG_NODE, &config_log_trap_cmd);
-		install_element(CONFIG_NODE, &no_config_log_trap_cmd);
 		install_element(CONFIG_NODE, &config_log_record_priority_cmd);
 		install_element(CONFIG_NODE,
 				&no_config_log_record_priority_cmd);
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index 66b49800dd..0697cd8b75 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -2441,24 +2441,6 @@ DEFUNSH(VTYSH_ALL, no_vtysh_log_facility, no_vtysh_log_facility_cmd,
 	return CMD_SUCCESS;
 }
 
-DEFUNSH_DEPRECATED(
-	VTYSH_ALL, vtysh_log_trap, vtysh_log_trap_cmd,
-	"log trap <emergencies|alerts|critical|errors|warnings|notifications|informational|debugging>",
-	"Logging control\n"
-	"(Deprecated) Set logging level and default for all destinations\n" LOG_LEVEL_DESC)
-{
-	return CMD_SUCCESS;
-}
-
-DEFUNSH_DEPRECATED(VTYSH_ALL, no_vtysh_log_trap, no_vtysh_log_trap_cmd,
-		   "no log trap [LEVEL]", NO_STR
-		   "Logging control\n"
-		   "Permit all logging information\n"
-		   "Logging level\n")
-{
-	return CMD_SUCCESS;
-}
-
 DEFUNSH(VTYSH_ALL, vtysh_log_record_priority, vtysh_log_record_priority_cmd,
 	"log record-priority",
 	"Logging control\n"
@@ -3766,8 +3748,6 @@ void vtysh_init_vty(void)
 	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_trap_cmd);
-	install_element(CONFIG_NODE, &no_vtysh_log_trap_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);