summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Ryzhov <iryzhov@nfware.com>2024-03-01 13:28:25 +0200
committerIgor Ryzhov <iryzhov@nfware.com>2024-03-05 17:56:21 +0200
commit1853ccdb0fc8c99fe023a5dc246347236f6917b8 (patch)
tree79332ceaad657632033e6a1586f968b0e7bf09e4
parenta44918640f8aa1a7b2626dc69eb385c7768a700b (diff)
vty: change output of errors from mgmtd
Make errors look the same way as in regular non-mgmtd vty. We don't need to show information about some internal request names. Before: ``` ERROR: SET_CONFIG request failed, Error: YANG error(s): Path: Data location "/frr-affinity-map:lib/affinity-maps/affinity-map[name='a']". Error: Unique data leaf(s) "value" not satisfied in "/frr-affinity-map:lib/affinity-maps/affinity-map[name='b']" and "/frr-affinity-map:lib/affinity-maps/affinity-map[name='a']". ``` After: ``` % Configuration failed. YANG error(s): Path: Data location "/frr-affinity-map:lib/affinity-maps/affinity-map[name='b']". Error: Unique data leaf(s) "value" not satisfied in "/frr-affinity-map:lib/affinity-maps/affinity-map[name='a']" and "/frr-affinity-map:lib/affinity-maps/affinity-map[name='b']". ``` Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
-rw-r--r--lib/vty.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/vty.c b/lib/vty.c
index 1c9cff478d..912c893556 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -3570,8 +3570,9 @@ static void vty_mgmt_set_config_result_notified(
zlog_err("SET_CONFIG request for client 0x%" PRIx64
" failed, Error: '%s'",
client_id, errmsg_if_any ? errmsg_if_any : "Unknown");
- vty_out(vty, "ERROR: SET_CONFIG request failed, Error: %s\n",
- errmsg_if_any ? errmsg_if_any : "Unknown");
+ vty_out(vty, "%% Configuration failed.\n\n");
+ if (errmsg_if_any)
+ vty_out(vty, "%s\n", errmsg_if_any);
} else {
debug_fe_client("SET_CONFIG request for client 0x%" PRIx64
" req-id %" PRIu64 " was successfull",
@@ -3602,8 +3603,9 @@ static void vty_mgmt_commit_config_result_notified(
zlog_err("COMMIT_CONFIG request for client 0x%" PRIx64
" failed, Error: '%s'",
client_id, errmsg_if_any ? errmsg_if_any : "Unknown");
- vty_out(vty, "ERROR: COMMIT_CONFIG request failed, Error: %s\n",
- errmsg_if_any ? errmsg_if_any : "Unknown");
+ vty_out(vty, "%% Configuration failed.\n\n");
+ if (errmsg_if_any)
+ vty_out(vty, "%s\n", errmsg_if_any);
} else {
debug_fe_client("COMMIT_CONFIG request for client 0x%" PRIx64
" req-id %" PRIu64 " was successfull",