diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-08-19 08:15:24 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 08:15:24 -0400 |
| commit | b80a2cd3942a65f37b66dbf5fe7a1105a50e6bbc (patch) | |
| tree | 5196a8dd0e468198a616f5c93d0ea080ac97ab38 /lib/northbound_confd.c | |
| parent | 4fe5bc8c6282b58cbd9206146bb38e983f815de8 (diff) | |
| parent | 0fe5b904b76ee37ee0d6ad6230e1ea330694f2ea (diff) | |
Merge pull request #6920 from opensourcerouting/nb-errors-apply-phase
lib: don't ignore error messages generated during the commit apply phase
Diffstat (limited to 'lib/northbound_confd.c')
| -rw-r--r-- | lib/northbound_confd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/northbound_confd.c b/lib/northbound_confd.c index a3aaf02f08..1f480f3d02 100644 --- a/lib/northbound_confd.c +++ b/lib/northbound_confd.c @@ -375,8 +375,10 @@ static int frr_confd_cdb_read_cb_commit(int fd, int *subp, int reslen) /* Apply the transaction. */ if (transaction) { struct nb_config *candidate = transaction->config; + char errmsg[BUFSIZ] = {0}; - nb_candidate_commit_apply(transaction, true, NULL); + nb_candidate_commit_apply(transaction, true, NULL, errmsg, + sizeof(errmsg)); nb_config_free(candidate); } @@ -400,8 +402,9 @@ static int frr_confd_cdb_read_cb_abort(int fd, int *subp, int reslen) /* Abort the transaction. */ if (transaction) { struct nb_config *candidate = transaction->config; + char errmsg[BUFSIZ] = {0}; - nb_candidate_commit_abort(transaction); + nb_candidate_commit_abort(transaction, errmsg, sizeof(errmsg)); nb_config_free(candidate); } |