sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

backport r15074, r15076, r15077: 

When we haven't had any application requests lately, don't bother
logging that we have expired a bunch of descriptors.


svn:r15182
This commit is contained in:
Roger Dingledine 2008-06-13 04:18:26 +00:00
parent a18d241252
commit d2ec69a7b0
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -19,11 +19,14 @@ Changes in version 0.2.0.28-rc - 2008-06-??
- If we change our MaxAdvertisedBandwidth and then reload torrc,
Tor won't realize it should publish a new relay descriptor. Fixes
bug 688, reported by mfr.
- While setting up a hidden service, some valid introduction circuits
were overlooked and abandoned. This might be the reason for
the long delay in making a hidden service available. Bugfix on
0.2.0.13-alpha.
- When we haven't had any application requests lately, don't bother
logging that we have expired a bunch of descriptors.
- Fix unit tests in 0.2.0.27-rc.
- Fix compile on Windows.
- While setting up a hidden service, some valid introduction circuits
were overlooked and given up. This might be the reason for the long
delay in making a hidden service available. Bugfix on 0.2.0.13-alpha.
Changes in version 0.2.0.27-rc - 2008-06-03

3
src/or/main.c
View File

@ -640,7 +640,8 @@ directory_info_has_arrived(time_t now, int from_cache)
or_options_t *options = get_options();
if (!router_have_minimum_dir_info()) {
log(LOG_NOTICE, LD_DIR,
int quiet = directory_too_idle_to_fetch_descriptors(options, now);
log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR,
"I learned some more directory information, but not enough to "
"build a circuit: %s", get_dir_info_status_string());
update_router_descriptor_downloads(now);

4
src/or/routerlist.c
View File

@ -4188,7 +4188,9 @@ update_router_have_minimum_dir_info(void)
control_event_client_status(LOG_NOTICE, "ENOUGH_DIR_INFO");
}
if (!res && have_min_dir_info) {
log(LOG_NOTICE, LD_DIR,"Our directory information is no longer up-to-date "
int quiet = directory_too_idle_to_fetch_descriptors(options, now);
log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR,
"Our directory information is no longer up-to-date "
"enough to build circuits: %s", dir_info_status);
control_event_client_status(LOG_NOTICE, "NOT_ENOUGH_DIR_INFO");
}