[or-cvs] r9744: backport those three log messages (tor/branches/tor-0_1_2-patches/src/or)

[arma@xxxxxxxx]

Author: arma
Date: 2007-03-06 14:41:12 -0500 (Tue, 06 Mar 2007)
New Revision: 9744

Modified:
   tor/branches/tor-0_1_2-patches/src/or/main.c
   tor/branches/tor-0_1_2-patches/src/or/routerlist.c
Log:
backport those three log messages


Modified: tor/branches/tor-0_1_2-patches/src/or/main.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/main.c	2007-03-06 19:37:18 UTC (rev 9743)
+++ tor/branches/tor-0_1_2-patches/src/or/main.c	2007-03-06 19:41:12 UTC (rev 9744)
@@ -1354,7 +1354,7 @@
   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 @@
   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;

Modified: tor/branches/tor-0_1_2-patches/src/or/routerlist.c
===================================================================
--- tor/branches/tor-0_1_2-patches/src/or/routerlist.c	2007-03-06 19:37:18 UTC (rev 9743)
+++ tor/branches/tor-0_1_2-patches/src/or/routerlist.c	2007-03-06 19:41:12 UTC (rev 9744)
@@ -2708,8 +2708,10 @@
     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;