Merge pull request #2406 from wking/drop-useless-select

openshift-merge-robot · web-flow · commit d434c5506925 · 2021-02-19T03:44:21.000-05:00
pkg/daemon: Drop unnecessary select from runLoginMonitor
diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
@@ -685,11 +685,9 @@ func (dn *Daemon) runLoginMonitor(stopCh <-chan struct{}, exitCh chan<- error) {
 			}
 		}
 	}()
-	select {
-	case <-stopCh:
-		close(worker)
-		cmd.Process.Kill()
-	}
+	<-stopCh
+	close(worker)
+	cmd.Process.Kill()
 }
 
 func (dn *Daemon) applySSHAccessedAnnotation() error {

Original file line number	Diff line number	Diff line change
`@@ -685,11 +685,9 @@ func (dn *Daemon) runLoginMonitor(stopCh <-chan struct{}, exitCh chan<- error) {`
`685`	`685`	`}`
`686`	`686`	`}`
`687`	`687`	`}()`
`688`		`- select {`
`689`		`- case <-stopCh:`
`690`		`- close(worker)`
`691`		`- cmd.Process.Kill()`
`692`		`- }`
	`688`	`+ <-stopCh`
	`689`	`+ close(worker)`
	`690`	`+ cmd.Process.Kill()`
`693`	`691`	`}`
`694`	`692`
`695`	`693`	`func (dn *Daemon) applySSHAccessedAnnotation() error {`