diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-04-14 16:25:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-04-14 16:25:21 -0400 |
| commit | 0e354ad45966d29ff4cd75854dbd1715270a2168 (patch) | |
| tree | 89990736b3281a145f8eb5a15e77c1560f8b2ca1 /src/or/main.c | |
| parent | 525307c0ea5717adba9f35cf7ccb1c5108ac3440 (diff) | |
| parent | a86ed1d717482f52e0b0ab390151401c28079d87 (diff) | |
| download | tor-0e354ad45966d29ff4cd75854dbd1715270a2168.tar.gz tor-0e354ad45966d29ff4cd75854dbd1715270a2168.zip | |
Merge branch 'assert_nonfatal_squashed'
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/or/main.c b/src/or/main.c index bf5b2b823a..fba9799a60 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1643,8 +1643,8 @@ rotate_x509_certificate_callback(time_t now, const or_options_t *options) * TLS context. */ log_info(LD_GENERAL,"Rotating tls context."); if (router_initialize_tls_context() < 0) { - log_warn(LD_BUG, "Error reinitializing TLS context"); - tor_assert(0); + log_err(LD_BUG, "Error reinitializing TLS context"); + tor_assert_unreached(); } /* We also make sure to rotate the TLS connections themselves if they've @@ -2563,9 +2563,7 @@ run_main_loop_once(void) return -1; #endif } else { - if (ERRNO_IS_EINPROGRESS(e)) - log_warn(LD_BUG, - "libevent call returned EINPROGRESS? Please report."); + tor_assert_nonfatal_once(! ERRNO_IS_EINPROGRESS(e)); log_debug(LD_NET,"libevent call interrupted."); /* You can't trust the results of this poll(). Go back to the * top of the big for loop. */ |