[tbb-commits] [tor-launcher/maint-0.2.14] Bug 20890: Increase control port connection timeout

[gk at torproject.org]

commit f34e4cc7047a752f4c33736924b2133b371829b8
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Wed May 16 14:17:16 2018 -0400

    Bug 20890: Increase control port connection timeout
    
    On slow computers, it can take longer than 30 seconds for Tor Launcher
    to connect to the tor control port. Increase the timeout to 5 minutes.
---
 src/components/tl-process.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/tl-process.js b/src/components/tl-process.js
index 53c9919..2bf5a4c 100644
--- a/src/components/tl-process.js
+++ b/src/components/tl-process.js
@@ -38,8 +38,8 @@ TorProcessService.prototype =
   kWizardProgressPageID: "progress",
 
   kInitialControlConnDelayMS: 25,
-  kMaxControlConnRetryMS: 500,
-  kControlConnTimeoutMS: 30000, // Wait at most 30 seconds for tor to start.
+  kMaxControlConnRetryMS: 2000,     // Retry at least every 2 seconds.
+  kControlConnTimeoutMS: 5*60*1000, // Wait at most 5 minutes for tor to start.
 
   kStatusUnknown: 0, // Tor process status.
   kStatusStarting: 1,