From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 28 Mar 2012 14:47:17 +0000 (-0400)
Subject: Tweak the bug4438 fix a little: different check, better log
X-Git-Tag: tor-0.2.3.15-alpha~11^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db81cdbb0f9a69bc7bb0a4f77ff0fe44875f7cda;p=thirdparty%2Ftor.git

Tweak the bug4438 fix a little: different check, better log

Instead of checking for 'rejected' and calling everything else okay,
let's check for 'outdated' and call everythign else a problem.  This
way we don't risk missing future errors so much.

When logging a message that _looks_ like an error message at info, we
should mention that it isn't really a problem.
---

diff --git a/src/or/router.c b/src/or/router.c
index 6199e9e3cc..451d95d03c 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -654,17 +654,18 @@ init_keys(void)
       }
       added = dirserv_add_descriptor(ri, &m, "self");
       if (!WRA_WAS_ADDED(added)) {
-        if (WRA_WAS_REJECTED(added)) {
+        if (!WRA_WAS_OUTDATED(added)) {
           log_err(LD_GENERAL, "Unable to add own descriptor to directory: %s",
                   m?m:"<unknown error>");
           return -1;
         } else {
-          /* If the descriptor wasn't rejected, that's ok. This can happen
+          /* If the descriptor was outdated, that's ok. This can happen
            * when some config options are toggled that affect workers, but
            * we don't really need new keys yet so the descriptor doesn't
            * change and the old one is still fresh. */
-          log_info(LD_GENERAL, "Couldn't add own descriptor to directory: %s",
-                   m?m:"unknown error>");
+          log_info(LD_GENERAL, "Couldn't add own descriptor to directory "
+                   "after key init: %s. This is usually not a problem.",
+                   m?m:"<unknown error>");
         }
       }
     }