[or-cvs] [tor/maint-0.2.2] Log more about soft-hibernation

[nickm@xxxxxxxxxxxxxx]

commit 5ce8182bdb45c41d8c5f9fea173c2ade1a18bfbb
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jan 25 18:45:13 2011 -0500

    Log more about soft-hibernation
---
 changes/bug2181    |    4 ++++
 src/or/hibernate.c |    6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changes/bug2181 b/changes/bug2181
new file mode 100644
index 0000000..0a09548
--- /dev/null
+++ b/changes/bug2181
@@ -0,0 +1,4 @@
+  o Minor features
+    - Log a little more clearly about the times at which we're no longer
+      accepting new connections.  Resolves bug 2181.
+
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 48a7ce7..1878d5d 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -783,7 +783,8 @@ hibernate_begin(hibernate_state_t new_state, time_t now)
   /* XXX upload rendezvous service descriptors with no intro points */
 
   if (new_state == HIBERNATE_STATE_EXITING) {
-    log_notice(LD_GENERAL,"Interrupt: will shut down in %d seconds. Interrupt "
+    log_notice(LD_GENERAL,"Interrupt: we have stopped accepting new "
+               "connections, and will shut down in %d seconds. Interrupt "
                "again to exit now.", options->ShutdownWaitLength);
     shutdown_time = time(NULL) + options->ShutdownWaitLength;
   } else { /* soft limit reached */
@@ -940,7 +941,8 @@ consider_hibernation(time_t now)
   if (hibernate_state == HIBERNATE_STATE_LIVE) {
     if (hibernate_soft_limit_reached()) {
       log_notice(LD_ACCT,
-                 "Bandwidth soft limit reached; commencing hibernation.");
+                 "Bandwidth soft limit reached; commencing hibernation. "
+                 "No new conncetions will be accepted");
       hibernate_begin(HIBERNATE_STATE_LOWBANDWIDTH, now);
     } else if (accounting_enabled && now < interval_wakeup_time) {
       format_local_iso_time(buf,interval_wakeup_time);