tor

commit 80c8689be1d0b6d926752059b51966d398f7c184
parent 94878cf1eaa59f4aae6bc88c93d55c4ecba1e0d9
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 31 Jan 2018 09:38:24 -0500

Merge remote-tracking branch 'public/ticket24849_032'

Diffstat:
A
changes/ticket24849
 | 
3
+++
M
src/or/dirvote.c
 | 
8
+++++++-

2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/changes/ticket24849 b/changes/ticket24849
@@ -0,0 +1,3 @@
+  o Minor features (directory authority):
+    - When unable to add signatures to a pending consensus, log the reason
+      why. Closes ticket 24849.
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
@@ -3560,7 +3560,13 @@ dirvote_add_signatures_to_pending_consensus(
   }
   r = networkstatus_add_detached_signatures(pc->consensus, sigs,
                                             source, severity, msg_out);
-  log_info(LD_DIR,"Added %d signatures to consensus.", r);
+  if (r >= 0) {
+    log_info(LD_DIR,"Added %d signatures to consensus.", r);
+  } else {
+    log_fn(LOG_PROTOCOL_WARN, LD_DIR,
+           "Unable to add signatures to consensus: %s",
+           *msg_out ? *msg_out : "(unknown)");
+  }
 
   if (r >= 1) {
     char *new_signatures =