commit 6a9e693fbe5fc7c418e1c187b34a1496b62544cc Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 2 18:54:16 2012 -0400

Suppress "decided to publish new descriptor" message when not a server

The message only means that we're publishing a new descriptor when we are actually in some kind of server mode, and publication is on.

Fix for bug 3942; bugfix on 0.2.3.2-alpha. --- changes/bug3942 | 4 ++++ src/or/router.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/changes/bug3942 b/changes/bug3942 new file mode 100644 index 0000000..f69c7bc --- /dev/null +++ b/changes/bug3942 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Don't log that we have "decided to publish new relay descriptor" unless + we are actually publishing a descriptor. Fix for bug 3942; bugfix on + 0.2.3.2-alpha. diff --git a/src/or/router.c b/src/or/router.c index bf15689..eb201f4 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1738,8 +1738,10 @@ mark_my_descriptor_dirty_if_too_old(time_t now) void mark_my_descriptor_dirty(const char *reason) { + const or_options_t *options = get_options(); + if (server_mode(options) && options->_PublishServerDescriptor) + log_info(LD_OR, "Decided to publish new relay descriptor: %s", reason); desc_clean_since = 0; - log_info(LD_OR, "Decided to publish new relay descriptor: %s", reason); if (!desc_dirty_reason) desc_dirty_reason = reason; }