cleanup and remove unwanted sleep

Author: cyrilst

cmd/sshproxy/sshproxy.go

@@ -375,9 +375,6 @@ func mainExitCode() int {
 							keepAliveChan = tmpKeepAliveChan
 							cli.Enable()
 						}
-					} else {
-						// Avoid looping too fast in case of a loss of etcd
-						time.Sleep(time.Second)
 					}
 				case <-ctx.Done():
 					return

pkg/utils/etcd.go

@@ -585,7 +585,7 @@ func (c *Client) GetAllGroups(allFlag bool) (map[string]*FlatGroup, error) {
 
 // IsAlive checks if etcd client is still usable.
 func (c *Client) IsAlive() bool {
-	return c.cli != nil && c.active == true
+	return c.cli != nil && c.active
 }
 
 // Enable enables the etcd client.

test/centos-image/sshproxy_test.go

@@ -684,7 +684,7 @@ func TestSCP(t *testing.T) {
 			line := "dump: etcd"
 			addLineSSHProxyConf(line)
 			defer removeLineSSHProxyConf(line)
-			line = "stats_interval: 5s"
+			line = "etcd_stats_interval: 5s"
 			addLineSSHProxyConf(line)
 			defer removeLineSSHProxyConf(line)
 		}