Merge pull request #2553 from mckennajones/bug/ignoresigpipe

Ignore sigpipe signals
hashicorp · Dec 14, 2016 · 7fbac3f · 7fbac3f
2 parents 3eeff54 + 8b3ab10
commit 7fbac3f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/command/agent/command.go b/command/agent/command.go
@@ -946,6 +946,7 @@ func (c *Command) Run(args []string) int {
 func (c *Command) handleSignals(config *Config, retryJoin <-chan struct{}, retryJoinWan <-chan struct{}) int {
 	signalCh := make(chan os.Signal, 4)
 	signal.Notify(signalCh, os.Interrupt, syscall.SIGTERM, syscall.SIGHUP)
+	signal.Notify(signalCh, os.Interrupt, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGPIPE)
 
 	// Wait for a signal
 WAIT:
@@ -971,6 +972,11 @@ WAIT:
 	}
 	c.Ui.Output(fmt.Sprintf("Caught signal: %v", sig))
 
+	// Skip SIGPIPE signals
+	if sig == syscall.SIGPIPE {
+		goto WAIT
+	}
+
 	// Check if this is a SIGHUP
 	if sig == syscall.SIGHUP {
 		conf, err := c.handleReload(config)