nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-13 06:33:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Nick Mathewson 2012-03-28 10:47:17 -04:00
parent 54520e49cd
commit db81cdbb0f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/or/router.c
View File

@ -654,17 +654,18 @@ init_keys(void)
} }
added = dirserv_add_descriptor(ri, &m, "self"); added = dirserv_add_descriptor(ri, &m, "self");
if (!WRA_WAS_ADDED(added)) { 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", log_err(LD_GENERAL, "Unable to add own descriptor to directory: %s",
m?m:"<unknown error>"); m?m:"<unknown error>");
return -1; return -1;
} else { } 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 * when some config options are toggled that affect workers, but
* we don't really need new keys yet so the descriptor doesn't * we don't really need new keys yet so the descriptor doesn't
* change and the old one is still fresh. */ * change and the old one is still fresh. */
log_info(LD_GENERAL, "Couldn't add own descriptor to directory: %s", log_info(LD_GENERAL, "Couldn't add own descriptor to directory "
m?m:"unknown error>"); "after key init: %s. This is usually not a problem.",
m?m:"<unknown error>");
} }
} }
} }