Merge pull request FRRouting#16431 from FRRouting/mergify/bp/stable/1…

…0.0/pr-16429 lib: move non-error from __log_err to __dbg (backport FRRouting#16429)
opensourcerouting · Jul 23, 2024 · 9a64394 · 9a64394
2 parents 73db693 + e8506a0
commit 9a64394
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/lib/vty.c b/lib/vty.c
@@ -3574,8 +3574,9 @@ static void vty_mgmt_set_config_result_notified(
 			errmsg_if_any ? errmsg_if_any : "Unknown");
 	} else {
 		debug_fe_client("SET_CONFIG request for client 0x%" PRIx64
-				" req-id %" PRIu64 " was successfull",
-				client_id, req_id);
+				" req-id %" PRIu64 " was successfull%s%s",
+				client_id, req_id, errmsg_if_any ? ": " : "",
+				errmsg_if_any ?: "");
 	}
 
 	if (implicit_commit) {
@@ -3606,8 +3607,9 @@ static void vty_mgmt_commit_config_result_notified(
 			errmsg_if_any ? errmsg_if_any : "Unknown");
 	} else {
 		debug_fe_client("COMMIT_CONFIG request for client 0x%" PRIx64
-				" req-id %" PRIu64 " was successfull",
-				client_id, req_id);
+				" req-id %" PRIu64 " was successfull%s%s",
+				client_id, req_id, errmsg_if_any ? ": " : "",
+				errmsg_if_any ?: "");
 		if (errmsg_if_any)
 			vty_out(vty, "MGMTD: %s\n", errmsg_if_any);
 	}
@@ -3638,8 +3640,9 @@ static int vty_mgmt_get_data_result_notified(
 	}
 
 	debug_fe_client("GET_DATA request succeeded, client 0x%" PRIx64
-			" req-id %" PRIu64,
-			client_id, req_id);
+			" req-id %" PRIu64 "%s%s",
+			client_id, req_id, errmsg_if_any ? ": " : "",
+			errmsg_if_any ?: "");
 
 	if (req_id != mgmt_last_req_id) {
 		mgmt_last_req_id = req_id;

diff --git a/mgmtd/mgmt_txn.c b/mgmtd/mgmt_txn.c
@@ -919,8 +919,8 @@ static int mgmt_txn_create_config_batches(struct mgmt_txn_req *txn_req,
 		}
 
 		if (!chg_clients)
-			__log_err("No connected daemon is interested in XPATH %s",
-				  xpath);
+			__dbg("Daemons interested in XPATH are not currently connected: %s",
+			      xpath);
 
 		cmtcfg_req->clients |= chg_clients;
 
@@ -931,7 +931,7 @@ static int mgmt_txn_create_config_batches(struct mgmt_txn_req *txn_req,
 	if (!num_chgs) {
 		(void)mgmt_txn_send_commit_cfg_reply(txn_req->txn,
 						     MGMTD_NO_CFG_CHANGES,
-						     "No changes found to commit!");
+						     "No connected daemons interested in changes");
 		return -1;
 	}