Merge pull request #128 from hyperdashio/sc-threading-timeouts

Use TIMEOUT_MAX for threading timeouts

Author: spence

hyperdash/VERSION

@@ -1 +1 @@
-0.15.2
+0.15.3

hyperdash_cli/cli.py

@@ -34,7 +34,7 @@
 from .constants import get_base_url
 from .constants import get_base_http_url
 from .constants import GITHUB_OAUTH_START
-from .constants import ONE_YEAR_IN_SECONDS
+from .constants import THREADING_TIMEOUT_MAX
 from .constants import LOOPBACK
 
 
@@ -231,18 +231,18 @@ def manual_entry():
     # user's browser to prevent a race condition where the Hyperdash server
     # redirects with an access token but the Python server isn't ready yet.
     # 
-    # Also, we set the timeout to ONE_YEAR_IN_SECONDS because without a timeout,
+    # Also, we set the timeout to THREADING_TIMEOUT_MAX because without a timeout,
     # the .get() call on the queue can not be interrupted with CTRL+C.
-    server_started_queue.get(block=True, timeout=ONE_YEAR_IN_SECONDS)
-    manual_entry_thread_started_queue.get(block=True, timeout=ONE_YEAR_IN_SECONDS)
+    server_started_queue.get(block=True, timeout=THREADING_TIMEOUT_MAX)
+    manual_entry_thread_started_queue.get(block=True, timeout=THREADING_TIMEOUT_MAX)
     # Blocks until browser opens, but doesn't wait for user to close it
     webbrowser.open_new_tab(auto_login_url)
 
 
     # Wait for the Hyperdash server to redirect with the access token to our embedded
     # server, or for the user to manually enter an access token. Whichever happens
     # first.
-    access_token = access_token_queue.get(block=True, timeout=ONE_YEAR_IN_SECONDS)
+    access_token = access_token_queue.get(block=True, timeout=THREADING_TIMEOUT_MAX)
     # Use the access token to retrieve the user's API key and store a valid
     # hyperdash.json file
     success, default_api_key = _after_access_token_login(access_token)

hyperdash_cli/constants.py

@@ -5,7 +5,7 @@
 
 GITHUB_OAUTH_START = "oauth/github/start"
 
-ONE_YEAR_IN_SECONDS = 365 * 24 * 60 * 60
+THREADING_TIMEOUT_MAX = 4294967  # Maximum allowed threading.TIMEOUT_MAX in Python 3.6
 
 LOOPBACK = "127.0.0.1"
 

requirements_dev.txt

@@ -3,6 +3,7 @@ nose==1.3.7
 requests==2.18.1
 six==1.10.0
 wheel==0.24.0
+tornado>=4.0.0,<5.0.0
 jupyter==1.0.0
 python-slugify==1.2.4
 twine==1.9.1