clean up a log message, and stop calling it an error when

we exit cleanly

svn:r9742

diff --git a/src/or/main.c b/src/or/main.c
index 7c801c7ad7397b2731c50f2f6799b2c679d62cc7..c12bcb9c7e7779c1cb0e192a904460afcae9ce78 100644 (file)
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1353,7 +1353,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;

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 7a76ae38f6ba611351bd61e1c6c6c61f0b56da3b..b97559447478131b0d76f480e791b2c5d02d96e0 100644 (file)
--- 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;