From 9590d69297a87cc6fa1f1d874b1e0a326055b0cf Mon Sep 17 00:00:00 2001
From: Colin Adler <colin@coder.com>
Date: Thu, 14 Apr 2022 02:48:40 +0000
Subject: [PATCH] review fixes

---
 client/service.go | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/client/service.go b/client/service.go
index 3b95db9a..eb592357 100644
--- a/client/service.go
+++ b/client/service.go
@@ -174,10 +174,7 @@ func (svr *Service) keepControllerWorking() {
 	reconnectCounts := 1
 
 	for {
-		svr.ctlMu.RLock()
-		ctlCh := svr.ctl.ClosedDoneCh()
-		svr.ctlMu.RUnlock()
-		<-ctlCh
+		<-svr.ctl.ClosedDoneCh()
 		if atomic.LoadUint32(&svr.exit) != 0 {
 			return
 		}
@@ -359,8 +356,8 @@ func (svr *Service) ReloadConf(pxyCfgs map[string]config.ProxyConf, visitorCfgs
 	svr.visitorCfgs = visitorCfgs
 	svr.cfgMu.Unlock()
 
-	svr.ctlMu.Lock()
-	defer svr.ctlMu.Unlock()
+	svr.ctlMu.RLock()
+	defer svr.ctlMu.RUnlock()
 	return svr.ctl.ReloadConf(pxyCfgs, visitorCfgs)
 }
 
@@ -371,11 +368,11 @@ func (svr *Service) Close() {
 func (svr *Service) GracefulClose(d time.Duration) {
 	atomic.StoreUint32(&svr.exit, 1)
 
-	svr.ctlMu.Lock()
+	svr.ctlMu.RLock()
 	if svr.ctl != nil {
 		svr.ctl.GracefulClose(d)
 	}
-	svr.ctlMu.Unlock()
+	svr.ctlMu.RUnlock()
 
 	svr.cancel()
 }