[or-cvs] r17066: {tor} Minor fix in the warning messages when you're having problem (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2008-10-12 23:34:29 -0400 (Sun, 12 Oct 2008)
New Revision: 17066

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/control.c
Log:
Minor fix in the warning messages when you're having problems 
bootstrapping; also, be more forgiving of bootstrap problems when
we're still making incremental progress on a given bootstrap phase.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-10-12 17:02:55 UTC (rev 17065)
+++ tor/trunk/ChangeLog	2008-10-13 03:34:29 UTC (rev 17066)
@@ -4,7 +4,12 @@
       identity fingerprints, so it's easier to paste them in.
       Suggested by Lucky Green.
 
+  o Minor bugfixes:
+    - Minor fix in the warning messages when you're having problems
+      bootstrapping; also, be more forgiving of bootstrap problems when
+      we're still making incremental progress on a given bootstrap phase.
 
+
 Changes in version 0.2.1.6-alpha - 2008-09-30
   Tor 0.2.1.6-alpha further improves performance and robustness of
   hidden services, starts work on supporting per-country relay selection,

Modified: tor/trunk/src/or/control.c
===================================================================
--- tor/trunk/src/or/control.c	2008-10-12 17:02:55 UTC (rev 17065)
+++ tor/trunk/src/or/control.c	2008-10-13 03:34:29 UTC (rev 17066)
@@ -3866,8 +3866,8 @@
     if (progress > bootstrap_percent) {
       /* incremental progress within a milestone */
       bootstrap_percent = progress;
+      bootstrap_problems = 0; /* Progress! Reset our problem counter. */
     }
-    bootstrap_problems = 0; /* Progress! Reset our problem counter. */
   }
 }
 
@@ -3901,6 +3901,7 @@
 
   while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0)
     status--; /* find a recognized status string based on current progress */
+  status = bootstrap_percent; /* set status back to the actual number */
 
   log_fn(!strcmp(recommendation, "warn") ? LOG_WARN : LOG_INFO,
          LD_CONTROL, "Problem bootstrapping. Stuck at %d%%: %s. (%s; %s; "