[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] r9742: clean up a log message, and stop calling it an error when we (tor/trunk/src/or)
- To: or-cvs@xxxxxxxxxxxxx
- Subject: [or-cvs] r9742: clean up a log message, and stop calling it an error when we (tor/trunk/src/or)
- From: arma@xxxxxxxx
- Date: Tue, 6 Mar 2007 14:33:45 -0500 (EST)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Tue, 06 Mar 2007 14:33:56 -0500
- Reply-to: or-talk@xxxxxxxxxxxxx
- Sender: owner-or-cvs@xxxxxxxxxxxxx
Author: arma
Date: 2007-03-06 14:33:43 -0500 (Tue, 06 Mar 2007)
New Revision: 9742
Modified:
tor/trunk/src/or/main.c
tor/trunk/src/or/routerlist.c
Log:
clean up a log message, and stop calling it an error when
we exit cleanly
Modified: tor/trunk/src/or/main.c
===================================================================
--- tor/trunk/src/or/main.c 2007-03-06 04:19:04 UTC (rev 9741)
+++ tor/trunk/src/or/main.c 2007-03-06 19:33:43 UTC (rev 9742)
@@ -1353,7 +1353,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;
Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c 2007-03-06 04:19:04 UTC (rev 9741)
+++ tor/trunk/src/or/routerlist.c 2007-03-06 19:33:43 UTC (rev 9742)
@@ -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;