Show when bazel run exited with code

Author: KoltesDigital

internal/ibazel/command/command.go

@@ -47,6 +47,7 @@ type Command interface {
 	Terminate()
 	Kill()
 	NotifyOfChanges() *bytes.Buffer
+	NotifyOfSubprocessExit()
 	IsSubprocessRunning() bool
 }
 

internal/ibazel/command/default_command.go

@@ -90,6 +90,15 @@ func (c *defaultCommand) NotifyOfChanges() *bytes.Buffer {
 	return nil
 }
 
+func (c *defaultCommand) NotifyOfSubprocessExit() {
+	c.termSync.Do(func() {
+		terminate(c.pg)
+	})
+	code := c.pg.RootProcess().ProcessState.ExitCode()
+	log.Logf("Exited (%d)", code)
+	c.pg = nil
+}
+
 func (c *defaultCommand) IsSubprocessRunning() bool {
 	return c.pg != nil && subprocessRunning(c.pg.RootProcess())
 }

internal/ibazel/command/notify_command.go

@@ -126,6 +126,15 @@ func (c *notifyCommand) NotifyOfChanges() *bytes.Buffer {
 	return outputBuffer
 }
 
+func (c *notifyCommand) NotifyOfSubprocessExit() {
+	c.termSync.Do(func() {
+		terminate(c.pg)
+	})
+	code := c.pg.RootProcess().ProcessState.ExitCode()
+	log.Logf("Exited (%d)", code)
+	c.pg = nil
+}
+
 func (c *notifyCommand) IsSubprocessRunning() bool {
 	return c.pg != nil && subprocessRunning(c.pg.RootProcess())
 }

internal/ibazel/ibazel.go

@@ -99,7 +99,7 @@ func New(version string) (*IBazel, error) {
 	i.workspaceFinder = &workspace.MainWorkspace{}
 
 	i.sigs = make(chan os.Signal, 1)
-	signal.Notify(i.sigs, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
+	signal.Notify(i.sigs, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGCHLD)
 
 	liveReload := live_reload.New()
 	profiler := profiler.New(version)
@@ -130,9 +130,17 @@ func New(version string) (*IBazel, error) {
 }
 
 func (i *IBazel) handleSignals() {
-	// Got an OS signal (SIGINT, SIGTERM, SIGHUP).
+	// Got an OS signal (SIGINT, SIGTERM, SIGHUP, SIGCHLD).
 	sig := <-i.sigs
 
+	// SIGCHLD can be received without an active cmd, so processing it separately.
+	if sig == syscall.SIGCHLD {
+		if i.cmd != nil && i.cmd.IsSubprocessRunning() {
+			i.cmd.NotifyOfSubprocessExit()
+		}
+		return
+	}
+
 	if i.cmd == nil || !i.cmd.IsSubprocessRunning() {
 		osExit(3)
 		return