]> git.proxmox.com Git - mirror_frr.git/commitdiff
Merge pull request #6945 from qlyoung/nb-more-messages
authorRenato Westphal <renato@opensourcerouting.org>
Wed, 19 Aug 2020 23:14:05 +0000 (20:14 -0300)
committerGitHub <noreply@github.com>
Wed, 19 Aug 2020 23:14:05 +0000 (20:14 -0300)
More gRPC logging + errmsg for no changes

1  2 
lib/northbound.c
lib/northbound_grpc.cpp

Simple merge
index f49a3b23f656b36f240232ff6711dd91d0da2ca7,a7b4f843ebc44e5206afdcb37ff561d727199a5c..f35b4bb31b2d6b469610dd4ce106b915e62c9d25
@@@ -689,17 -691,18 +691,20 @@@ class NorthboundImp
                                        sizeof(errmsg));
                                break;
                        case frr::CommitRequest::ABORT:
+                               zlog_debug("`-> Performing ABORT");
                                nb_candidate_commit_abort(
 -                                      candidate->transaction);
 +                                      candidate->transaction, errmsg,
 +                                      sizeof(errmsg));
                                break;
                        case frr::CommitRequest::APPLY:
+                               zlog_debug("`-> Performing ABORT");
                                nb_candidate_commit_apply(
                                        candidate->transaction, true,
 -                                      &transaction_id);
 +                                      &transaction_id, errmsg,
 +                                      sizeof(errmsg));
                                break;
                        case frr::CommitRequest::ALL:
+                               zlog_debug("`-> Performing ALL");
                                ret = nb_candidate_commit(
                                        &context, candidate->config, true,
                                        comment.c_str(), &transaction_id,