Merge pull request #107 from creichert/master

Change default connection time bound calculation from 5s to 5min.
snoyberg · Jun 30, 2015 · a2eee4e · a2eee4e
2 parents 1bcc651 + 4874184
commit a2eee4e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/Keter/Main.hs b/Keter/Main.hs
@@ -193,7 +193,9 @@ startListening KeterConfig {..} hostman = do
     manager <- HTTP.newManager HTTP.conduitManagerSettings
     runAndBlock kconfigListeners $ Proxy.reverseProxy
         kconfigIpFromHeader
-        kconfigConnectionTimeBound
+        -- calculate the number of microseconds since the
+        -- configuration option is in milliseconds
+        (kconfigConnectionTimeBound * 1000)
         manager
         (HostMan.lookupAction hostman . CI.mk)
 

diff --git a/Keter/Types/V04.hs b/Keter/Types/V04.hs
@@ -80,6 +80,7 @@ data KeterConfig = KeterConfig
     , kconfigReverseProxy        :: Set ReverseProxyConfig
     , kconfigIpFromHeader        :: Bool
     , kconfigConnectionTimeBound :: Int
+    -- ^ Maximum request time in milliseconds per connection.
     }
 
 instance Default KeterConfig where
@@ -95,6 +96,8 @@ instance Default KeterConfig where
         , kconfigConnectionTimeBound = fiveMinutes
         }
 
+
+-- | Default connection time bound in milliseconds.
 fiveMinutes :: Int
 fiveMinutes = 5 * 60 * 1000
 

diff --git a/Keter/Types/V10.hs b/Keter/Types/V10.hs
@@ -102,6 +102,7 @@ data KeterConfig = KeterConfig
     , kconfigEnvironment         :: !(Map Text Text)
     -- ^ Environment variables to be passed to all apps.
     , kconfigConnectionTimeBound :: !Int
+    -- ^ Maximum request time in milliseconds per connection.
     }
 
 instance ToCurrent KeterConfig where