Merge branch 'maint-0.2.8'

This commit is contained in:
Nick Mathewson 2016-04-05 23:18:48 -04:00
commit 20d39e86af
2 changed files with 6 additions and 3 deletions

3
changes/bug18729 Normal file
View File

@ -0,0 +1,3 @@
o Minor logging changes:
- Stop blasting twelve lines per second from periodic_event_dispatch()
at loglevel debug. Resolves ticket 18729; fix on 0.2.8.1-alpha.

View File

@ -48,7 +48,7 @@ periodic_event_dispatch(evutil_socket_t fd, short what, void *data)
time_t now = time(NULL);
const or_options_t *options = get_options();
log_debug(LD_GENERAL, "Dispatching %s", event->name);
// log_debug(LD_GENERAL, "Dispatching %s", event->name);
int r = event->fn(now, options);
int next_interval = 0;
@ -71,8 +71,8 @@ periodic_event_dispatch(evutil_socket_t fd, short what, void *data)
next_interval = 1;
}
log_debug(LD_GENERAL, "Scheduling %s for %d seconds", event->name,
next_interval);
// log_debug(LD_GENERAL, "Scheduling %s for %d seconds", event->name,
// next_interval);
struct timeval tv = { next_interval , 0 };
event_add(event->ev, &tv);
}