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.
This commit is contained in:
Nick Mathewson 2017-05-24 09:08:59 -04:00
parent af98b862a5
commit b80a35e683
2 changed files with 11 additions and 6 deletions

4
changes/bug1121 Normal file
View File

@ -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.

View File

@ -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;