ExperimentalEventHandler: clean up in afterCommand

The experimental event handler honors the AfterCommandEvent
which tells to clean up resources. Do so properly, by also
flushing output and resetting the terminal (and then flushing
it). As a nice side effect, this event handler does not need
a separate release handling from the command dispatcher.

Change-Id: If93cfa1b0f8d12e94fa4f57c9e2ee67362bd7d11
PiperOrigin-RevId: 170175617

2 files changed, 11 insertions, 19 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
index df97889f53..a8807acdaa 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
@@ -620,10 +620,10 @@ public class BlazeCommandDispatcher {
       System.setOut(savedOut);
       System.setErr(savedErr);
       reporter.removeHandler(handler);
-      releaseHandler(handler, eventHandlerOptions);
+      releaseHandler(handler);
       if (!eventHandlerOptions.useColor()) {
         reporter.removeHandler(ansiAllowingHandler);
-        releaseHandler(ansiAllowingHandler, eventHandlerOptions);
+        releaseHandler(ansiAllowingHandler);
       }
       env.getTimestampGranularityMonitor().waitForTimestampGranularity(outErr);
     }
@@ -976,20 +976,13 @@ public class BlazeCommandDispatcher {
     return RateLimitingEventHandler.create(eventHandler, eventOptions.showProgressRateLimit);
   }
 
-  /**
-   * Unsets the event handler.
-   */
-  private void releaseHandler(EventHandler eventHandler,
-      BlazeCommandEventHandler.Options eventOptions) {
+  /** Unsets the event handler. */
+  private void releaseHandler(EventHandler eventHandler) {
     if (eventHandler instanceof FancyTerminalEventHandler) {
       // Make sure that the terminal state of the old event handler is clear
       // before creating a new one.
       ((FancyTerminalEventHandler) eventHandler).resetTerminal();
     }
-    if ((eventHandler instanceof ExperimentalEventHandler)
-        && (eventOptions.useColor())) {
-      ((ExperimentalEventHandler) eventHandler).resetTerminal();
-    }
   }
 
   /**
diff --git a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java
index 169c86979c..7b243546b4 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/ExperimentalEventHandler.java
@@ -518,6 +518,13 @@ public class ExperimentalEventHandler implements EventHandler {
       buildRunning = true;
     }
     stopUpdateThread();
+    flushStdOutStdErrBuffers();
+    try {
+      terminal.resetTerminal();
+      terminal.flush();
+    } catch (IOException e) {
+      logger.warning("IO Error writing to user terminal: " + e);
+    }
   }
 
   @Subscribe
@@ -779,14 +786,6 @@ public class ExperimentalEventHandler implements EventHandler {
     }
   }
 
-  public void resetTerminal() {
-    try {
-      terminal.resetTerminal();
-    } catch (IOException e) {
-      logger.warning("IO Error writing to user terminal: " + e);
-    }
-  }
-
   private void clearProgressBar() throws IOException {
     if (!cursorControl) {
       return;