From fcb49ce518eb9a99cbee3f2edd1f13f415bee3d9 Mon Sep 17 00:00:00 2001
From: Ricky Ramirez <rram@reddit.com>
Date: Mon, 9 Sep 2013 12:20:31 -0700
Subject: [PATCH] health: Use one second for the timeouts.

---
 r2/r2/controllers/health.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/r2/r2/controllers/health.py b/r2/r2/controllers/health.py
index cf6e2bed5..4e0b20bcc 100644
--- a/r2/r2/controllers/health.py
+++ b/r2/r2/controllers/health.py
@@ -56,9 +56,11 @@ class HealthController(MinimalController):
     def GET_cachehealth(self):
         results = {}
         behaviors = {
-            "connect_timeout": 3,
-            "receive_timeout": 3,
-            "send_timeout": 3,
+            # Passed on to poll(2) in milliseconds
+            "connect_timeout": 1000,
+            # Passed on to setsockopt(2) in microseconds
+            "receive_timeout": int(1e6),
+            "send_timeout": int(1e6),
         }
         for server in cache._CACHE_SERVERS:
             try: