diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-10-06 15:41:17 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-10-06 15:41:17 -0400 |
| commit | 8fa7bace29678c7a2eb1de0379b8630be5644eac (patch) | |
| tree | d3cee3edf9832c61e89050bf1518f0a40478d787 | |
| parent | a6c848ff6ff67a27ca6b59d2884e63cd74df63fd (diff) | |
| parent | 065ebd10c2baee20f2963ac7116701d9593027a8 (diff) | |
| download | tor-8fa7bace29678c7a2eb1de0379b8630be5644eac.tar.gz tor-8fa7bace29678c7a2eb1de0379b8630be5644eac.zip | |
Merge branch 'maint-0.4.5' into release-0.4.5
| -rw-r--r-- | changes/bug40175 | 5 | ||||
| -rw-r--r-- | src/feature/dirclient/dirclient.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changes/bug40175 b/changes/bug40175 new file mode 100644 index 0000000000..aa2ce9566f --- /dev/null +++ b/changes/bug40175 @@ -0,0 +1,5 @@ + o Minor features (logging, diagnostic): + - Log decompression failures at a higher severity level, since they + can help provide missing context for other warning messages. + We rate-limit these messages, to avoid flooding the logs if they + begin to occur frequently. Closes ticket 40175. diff --git a/src/feature/dirclient/dirclient.c b/src/feature/dirclient/dirclient.c index f2e1e5b5ff..170802173d 100644 --- a/src/feature/dirclient/dirclient.c +++ b/src/feature/dirclient/dirclient.c @@ -1959,7 +1959,9 @@ dir_client_decompress_response_body(char **bodyp, size_t *bodylenp, /* If we're pretty sure that we have a compressed directory, and * we didn't manage to uncompress it, then warn and bail. */ if (!plausible && !new_body) { - log_fn(LOG_PROTOCOL_WARN, LD_HTTP, + const int LOG_INTERVAL = 3600; + static ratelim_t warning_limit = RATELIM_INIT(LOG_INTERVAL); + log_fn_ratelim(&warning_limit, LOG_WARN, LD_HTTP, "Unable to decompress HTTP body (tried %s%s%s, on %s).", description1, tried_both?" and ":"", |