Add support for controller request retries, connection timeout

1 files changed, 22 insertions, 2 deletions

diff --git a/bbot/agent/agent.cli b/bbot/agent/agent.cli
index a5dbe01..0f306fb 100644
--- a/bbot/agent/agent.cli
+++ b/bbot/agent/agent.cli
@@ -150,7 +150,8 @@ namespace bbot
     size_t --bootstrap-retries = 2
     {
       "<num>",
-      "Number of time to retry a mis-booted bootstrap, 2 by default."
+      "Number of times to retry a mis-booted bootstrap, 2 (3 attempts total)
+       by default."
     }
 
     size_t --build-timeout = 1800
@@ -163,7 +164,15 @@ namespace bbot
     size_t --build-retries = 2
     {
       "<num>",
-      "Number of time to retry a mis-booted build, 2 by default."
+      "Number of times to retry a mis-booted build, 2 (3 attempts total) by
+       default."
+    }
+
+    size_t --connect-timeout = 60
+    {
+      "<sec>",
+      "Maximum number of seconds to wait for controller request connection,
+       60 (1 minute) by default."
     }
 
     size_t --request-timeout = 300
@@ -173,6 +182,17 @@ namespace bbot
        300 (5 minutes) by default."
     }
 
+    size_t --request-retries = 4
+    {
+      "<num>",
+      "Number of times to retry a controller request, 4 (5 attempts total) by
+       default. Note that both the total time for all retries as well as the
+       time of each retry are limited by the same \c{--request-timeout}
+       value. This means that a successful request may take up to twice as
+       long if a connection was established at the end of the retry window
+       and took just as long to complete."
+    }
+
     uint16_t --verbose = 1
     {
       "<level>",