commit b80a35e683d63635655191b83200a765141e4fab Author: Nick Mathewson nickm@torproject.org Date: Wed May 24 09:08:59 2017 -0400

Improve the message we log on unexpected dirauth status code

It's still not great, but should be less confusing what's wrong here.

Closes ticket 1121. --- changes/bug1121 | 4 ++++ src/or/directory.c | 13 +++++++------ 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/changes/bug1121 b/changes/bug1121 new file mode 100644 index 0000000..d11ed64 --- /dev/null +++ b/changes/bug1121 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Provide a better log message when a directory authority responds + to an upload with an unexpected status code. Fixes bug 11121; + bugfix on 0.1.0.1-rc. diff --git a/src/or/directory.c b/src/or/directory.c index 740333d..a8f9788 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -2895,8 +2895,9 @@ handle_response_upload_dir(dir_connection_t *conn, break; default: log_warn(LD_GENERAL, - "http status %d (%s) reason unexpected while uploading " - "descriptor to server '%s:%d').", + "HTTP status %d (%s) was unexpected while uploading " + "descriptor to server '%s:%d'. Possibly the server is " + "misconfigured?", status_code, escaped(reason), conn->base_.address, conn->base_.port); break; @@ -2932,8 +2933,8 @@ handle_response_upload_vote(dir_connection_t *conn, break; default: log_warn(LD_GENERAL, - "http status %d (%s) reason unexpected while uploading " - "vote to server '%s:%d').", + "HTTP status %d (%s) was unexpected while uploading " + "vote to server '%s:%d'.", status_code, escaped(reason), conn->base_.address, conn->base_.port); break; @@ -2968,8 +2969,8 @@ handle_response_upload_signatures(dir_connection_t *conn, break; default: log_warn(LD_GENERAL, - "http status %d (%s) reason unexpected while uploading " - "signatures to server '%s:%d').", + "HTTP status %d (%s) was unexpected while uploading " + "signatures to server '%s:%d'.", status_code, escaped(reason), conn->base_.address, conn->base_.port); break;