Merge b4474ec619bdf45190e4aaf5b55c70c25a983712 into c1893ee1b45278215c70b2852ededcde126da6d1

client/service.go

@@ -380,31 +380,18 @@ func (svr *Service) stop() {
 	}
 }
 
-func (svr *Service) getProxyStatus(name string) (*proxy.WorkingStatus, bool) {
+// TODO(fatedier): Use StatusExporter to provide query interfaces instead of directly using methods from the Service.
+func (svr *Service) GetProxyStatus(name string) (*proxy.WorkingStatus, error) {
 	svr.ctlMu.RLock()
 	ctl := svr.ctl
 	svr.ctlMu.RUnlock()
 
 	if ctl == nil {
-		return nil, false
+		return nil, fmt.Errorf("control is not running")
 	}
-	return ctl.pm.GetProxyStatus(name)
+	ws, ok := ctl.pm.GetProxyStatus(name)
-}
+	if !ok {
-
+		return nil, fmt.Errorf("proxy [%s] is not found", name)
-func (svr *Service) StatusExporter() StatusExporter {
-	return &statusExporterImpl{
-		getProxyStatusFunc: svr.getProxyStatus,
 	}
-}
+	return ws, nil
-
-type StatusExporter interface {
-	GetProxyStatus(name string) (*proxy.WorkingStatus, bool)
-}
-
-type statusExporterImpl struct {
-	getProxyStatusFunc func(name string) (*proxy.WorkingStatus, bool)
-}
-
-func (s *statusExporterImpl) GetProxyStatus(name string) (*proxy.WorkingStatus, bool) {
-	return s.getProxyStatusFunc(name)
 }

pkg/ssh/server.go

@@ -363,13 +363,11 @@ func (s *TunnelServer) waitProxyStatusReady(name string, timeout time.Duration)
 	timer := time.NewTimer(timeout)
 	defer timer.Stop()
 
-	statusExporter := s.vc.Service().StatusExporter()
-
 	for {
 		select {
 		case <-ticker.C:
-			ps, ok := statusExporter.GetProxyStatus(name)
+			ps, err := s.vc.Service().GetProxyStatus(name)
-			if !ok {
+			if err != nil {
 				continue
 			}
 			switch ps.Phase {