diff options
| author |  ccalvarin <ccalvarin@google.com> | 2017-03-28 21:12:28 +0000 |
|---|---|---|
| committer |  Philipp Wollermann <philwo@google.com> | 2017-03-29 14:22:15 +0200 |
| commit | 1419ddac5fb5b7d6aec9ac0e3d27dfcd53692bb7 (patch) | |
| tree | 4d00412d185cb43b0f57ac1bfad44b3645c6bbdd /src/main/java/com/google/devtools | |
| parent | 68bc0bb365906f29d22561819e8db6b98c44c482 (diff) | |
Remove configurability of abrupt exit code behavior.
Ability to configure this was added to provide an easy correction in case
writing the exit code to a file proved problematic. This feature has been out
for 3 months with no reported issues, no reason to keep the extraneous flag.
PiperOrigin-RevId: 151496431
Diffstat (limited to 'src/main/java/com/google/devtools')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java | 5 | ||||
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/runtime/BlazeServerStartupOptions.java | 12 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java index 270d89f8f7..cf8aff0bad 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java @@ -1016,9 +1016,8 @@ public final class BlazeRuntime { ExitCode.LOCAL_ENVIRONMENTAL_ERROR); } runtime.initWorkspace(directories, binTools); - if (startupOptions.useCustomExitCodeOnAbruptExit) { - CustomExitCodePublisher.setAbruptExitStatusFileDir(serverDirectories.getOutputBase()); - } + CustomExitCodePublisher.setAbruptExitStatusFileDir(serverDirectories.getOutputBase()); + AutoProfiler.setClock(runtime.getClock()); BugReport.setRuntime(runtime); return runtime; 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 fe4fe8cfe1..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 @@ -286,16 +286,4 @@ public class BlazeServerStartupOptions extends OptionsBase { category = "server startup", help = "The amount of time the client waits for each attempt to connect to the server") public int connectTimeoutSecs; - - @Option( - name = "use_custom_exit_code_on_abrupt_exit", - defaultValue = "true", // NOTE: purely decorative! - category = "undocumented", - help = - "If the Blaze server exits abruptly without access to traditional channels to " - + "communicate its exit code, attempt to communicate through a backup channel. " - + "This flag is temporary to allow easy disabling of a new behavior. " - + "Please do not use this flag." - ) - public boolean useCustomExitCodeOnAbruptExit; } |