Add two startup options:

- --client_debug that turns out debug logging from the client
- --connect_timeout_secs that controls the timeout of the initial Ping() RPC from the client to the server

--
MOS_MIGRATED_REVID=138491791

1 files changed, 12 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
index 1849c3672e..64a9da783e 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java
@@ -274,4 +274,16 @@ public class BlazeServerStartupOptions extends OptionsBase {
       category = "undocumented",
       help = "Whether or not to write the command.log file")
   public boolean writeCommandLog;
+
+  @Option(name = "client_debug",
+      defaultValue = "false", // NOTE: purely decorative!
+      category = "server startup",
+      help = "If true, log debug information from the client to stderr")
+  public boolean clientDebug;
+
+  @Option(name = "connect_timeout_secs",
+      defaultValue = "10",
+      category = "server startup",
+      help = "The amount of time the client waits for each attempt to connect to the server")
+  public int connectTimeoutSecs;
 }