diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-03-06 19:41:12 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-03-06 19:41:12 +0000 |
| commit | 197e4f8e5aac474a385612c97eef792aaee093bf (patch) | |
| tree | ef6749a87082987885ebdd5cc7eda523a408238f | |
| parent | 1a4d934054fed0d9bd23a5524e2fcfdb1750bd68 (diff) | |
| download | tor-197e4f8e5aac474a385612c97eef792aaee093bf.tar.gz tor-197e4f8e5aac474a385612c97eef792aaee093bf.zip | |
backport those three log messages
svn:r9744
| -rw-r--r-- | src/or/main.c | 6 | ||||
| -rw-r--r-- | src/or/routerlist.c | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/or/main.c b/src/or/main.c index 8594080a97..2f52055a88 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -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; diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 3b00d4cf8f..24d829e9d6 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -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; |