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

backport those three log messages 

svn:r9744
This commit is contained in:
Roger Dingledine 2007-03-06 19:41:12 +00:00
parent 1a4d934054
commit 197e4f8e5a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/or/main.c
View File

@ -1354,7 +1354,7 @@ signal_callback(int fd, short events, void *arg)
switch (sig)
{
case SIGTERM:
log_err(LD_GENERAL,"Catching signal TERM, exiting cleanly.");
log_notice(LD_GENERAL,"Catching signal TERM, exiting cleanly.");
tor_cleanup();
exit(0);
break;
@ -1926,8 +1926,8 @@ nt_service_control(DWORD request)
switch (request) {
case SERVICE_CONTROL_STOP:
case SERVICE_CONTROL_SHUTDOWN:
log_err(LD_GENERAL,
"Got stop/shutdown request; shutting down cleanly.");
log_notice(LD_GENERAL,
"Got stop/shutdown request; shutting down cleanly.");
service_status.dwCurrentState = SERVICE_STOP_PENDING;
event_loopexit(&exit_now);
return;

6
src/or/routerlist.c
View File

@ -2708,8 +2708,10 @@ router_get_combined_status_by_nickname(const char *nickname,
base16_encode(fp, sizeof(fp),
best->status.identity_digest, DIGEST_LEN);
log_warn(LD_CONFIG,
"To look up a status, you specified a server \"%s\" by name, but the "
"directory authorities do not have a binding for this nickname. "
"When looking up a status, you specified a server \"%s\" by name, "
"but the directory authorities do not have any key registered for "
"this nickname -- so it could be used by any server, "
"not just the one you meant. "
"To make sure you get the same server in the future, refer to "
"it by key, as \"$%s\".", nickname, fp);
best->name_lookup_warned = 1;