diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-01-31 09:50:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-01-31 09:50:24 -0500 |
| commit | 69e242f845fa53ee0930127dc9dccae8ca5c70e8 (patch) | |
| tree | 2369039ddd0f3574635355b483a663b598b7e6ea | |
| parent | 914ec372a9352308c3990afb5304f7e8d39b1020 (diff) | |
| parent | e81896adda197b705958bcbe2b9d2c5db839b8a5 (diff) | |
| download | tor-69e242f845fa53ee0930127dc9dccae8ca5c70e8.tar.gz tor-69e242f845fa53ee0930127dc9dccae8ca5c70e8.zip | |
Merge branch 'maint-0.3.2'
| -rw-r--r-- | changes/bug24859 | 4 | ||||
| -rw-r--r-- | src/or/consdiffmgr.c | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changes/bug24859 b/changes/bug24859 new file mode 100644 index 0000000000..122109d650 --- /dev/null +++ b/changes/bug24859 @@ -0,0 +1,4 @@ + o Minor bugfixes (logging): + - Don't treat inability to store a cached consensus object as a + bug: it can happen normally when we are out of disk space. + Fixes bug 24859; bugfix on 0.3.1.1-alpha. diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 38d901a3ae..eb862192d4 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1313,8 +1313,11 @@ store_multiple(consensus_cache_entry_handle_t **handles_out, labels, body_out, bodylen_out); - if (BUG(ent == NULL)) + if (ent == NULL) { + log_warn(LD_FS, "Unable to store object %s compressed with %s.", + description, methodname); continue; + } status = CDM_DIFF_PRESENT; handles_out[i] = consensus_cache_entry_handle_new(ent); |