style: Optimize code

Change-Id: Iacccb23105c02aa8896c98368747a823df5ad53e

go.mod

@@ -1,13 +1,7 @@
 module github.com/henrylee2cn/teleport
 
-go 1.12
-
 require (
 	git.apache.org/thrift.git v0.0.0-20190629060710-d9019fc5a4a2
-	github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect
-	github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 // indirect
-	github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect
-	github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 // indirect
 	github.com/gogo/protobuf v1.2.1
 	github.com/golang/protobuf v1.3.1
 	github.com/henrylee2cn/cfgo v0.0.0-20180417024816-e6c3cc325b21
@@ -19,3 +13,5 @@ require (
 	github.com/tidwall/gjson v1.2.2
 	golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb
 )
+
+go 1.13

go.sum

@@ -4,14 +4,6 @@ github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitf
 github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ=
 github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ=
-github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64=
-github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 h1:wWke/RUCl7VRjQhwPlR/v0glZXNYzBHdNUzf/Am2Nmg=
-github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9/go.mod h1:uPmAp6Sws4L7+Q/OokbWDAK1ibXYhB3PXFP1kol5hPg=
-github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A=
-github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg=
-github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y=
-github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
@@ -23,12 +15,6 @@ github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/henrylee2cn/cfgo v0.0.0-20180417024816-e6c3cc325b21 h1:LM2kOY1tjXcSuIXwTVRRghOMa4ibfrVmeUw6PRmH+N4=
 github.com/henrylee2cn/cfgo v0.0.0-20180417024816-e6c3cc325b21/go.mod h1:lfF29QC4YBzvpcYuZIFsOb2SKywK47MV8F1VOPH0cUM=
-github.com/henrylee2cn/goutil v0.0.0-20190630130639-d26f3f84e806 h1:t1+bgwvPE2RHU/FhGmvErIB5H9OdihA61b2XUjXza2A=
-github.com/henrylee2cn/goutil v0.0.0-20190630130639-d26f3f84e806/go.mod h1:I9qYeMYwdKC7UFXMECNzCEv0fYuolqLeBMqsmeG7IVo=
-github.com/henrylee2cn/goutil v0.0.0-20190825033852-493ba6f901f5 h1:n2TIXvjleQ0gVAqhnw/48LjcFn27qrWhMGBcyrIbm0c=
-github.com/henrylee2cn/goutil v0.0.0-20190825033852-493ba6f901f5/go.mod h1:I9qYeMYwdKC7UFXMECNzCEv0fYuolqLeBMqsmeG7IVo=
-github.com/henrylee2cn/goutil v0.0.0-20190825044752-802bc5b8d468 h1:PgnQgzMhuAAi3arsz/q04O12oLJqDUT450oZ5rDBBG0=
-github.com/henrylee2cn/goutil v0.0.0-20190825044752-802bc5b8d468/go.mod h1:I9qYeMYwdKC7UFXMECNzCEv0fYuolqLeBMqsmeG7IVo=
 github.com/henrylee2cn/goutil v0.0.0-20190918075917-250d9105ebb6 h1:K1JnVyvSxtUFTJi0ncMF0zCh0mdUR0EtyF+hwNxKJYA=
 github.com/henrylee2cn/goutil v0.0.0-20190918075917-250d9105ebb6/go.mod h1:LOjwSLY8Sl1qX83frwNZ69TJOH2L8V2OClKz+4BnHPw=
 github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=

peer.go

@@ -186,7 +186,7 @@ func (p *peer) SetTLSConfigFromFile(tlsCertFile, tlsKeyFile string, insecureSkip
 
 // GetSession gets the session by id.
 func (p *peer) GetSession(sessionID string) (Session, bool) {
-	return p.sessHub.Get(sessionID)
+	return p.sessHub.get(sessionID)
 }
 
 // RangeSession ranges all sessions.
@@ -292,7 +292,7 @@ func (p *peer) newSessionForClient(dialFunc func() (net.Conn, error), addr strin
 	Infof("dial ok (network:%s, addr:%s, id:%s)", p.network, sess.RemoteAddr().String(), sess.ID())
 	sess.changeStatus(statusOk)
 	AnywayGo(sess.startReadAndHandle)
-	p.sessHub.Set(sess)
+	p.sessHub.set(sess)
 	return sess, nil
 }
 
@@ -323,7 +323,7 @@ func (p *peer) renewSessionForClientLocked(sess *session, dialFunc func() (net.C
 	}
 	sess.changeStatus(statusOk)
 	AnywayGo(sess.startReadAndHandle)
-	p.sessHub.Set(sess)
+	p.sessHub.set(sess)
 	return nil
 }
 
@@ -352,7 +352,7 @@ func (p *peer) ServeConn(conn net.Conn, protoFunc ...ProtoFunc) (Session, *Statu
 	Infof("serve ok (network:%s, addr:%s, id:%s)", network, sess.RemoteAddr().String(), sess.ID())
 	sess.changeStatus(statusOk)
 	AnywayGo(sess.startReadAndHandle)
-	p.sessHub.Set(sess)
+	p.sessHub.set(sess)
 	return sess, nil
 }
 
@@ -423,7 +423,7 @@ func (p *peer) serveListener(lis net.Listener, protoFunc ...ProtoFunc) error {
 				return
 			}
 			Infof("accept ok (network:%s, addr:%s, id:%s)", network, sess.RemoteAddr().String(), sess.ID())
-			p.sessHub.Set(sess)
+			p.sessHub.set(sess)
 			sess.changeStatus(statusOk)
 			sess.startReadAndHandle()
 		})
@@ -460,7 +460,7 @@ func (p *peer) Close() (err error) {
 		count int
 		errCh = make(chan error, 1024)
 	)
-	p.sessHub.Range(func(sess *session) bool {
+	p.sessHub.rangeCallback(func(sess *session) bool {
 		count++
 		MustGo(func() {
 			errCh <- sess.Close()

session.go

@@ -321,8 +321,8 @@ func (s *session) SetID(newID string) {
 	}
 	s.socket.SetID(newID)
 	hub := s.peer.sessHub
-	hub.Set(s)
-	hub.Delete(oldID)
+	hub.set(s)
+	hub.delete(oldID)
 	Tracef("session changes id: %s -> %s", oldID, newID)
 }
 
@@ -782,7 +782,7 @@ func (s *session) closeLocked() error {
 	if !s.tryChangeStatus(statusActiveClosing, statusOk, statusPreparing) {
 		return nil
 	} // readDisconnected is being called
-	s.peer.sessHub.Delete(s.ID())
+	s.peer.sessHub.delete(s.ID())
 	s.notifyClosed()
 	s.graceCtxWait()
 	s.graceCallCmdWaitGroup.Wait()
@@ -802,7 +802,7 @@ func (s *session) readDisconnected(oldConn net.Conn, err error) {
 		s.changeStatus(statusPassiveClosing)
 	}
 
-	s.peer.sessHub.Delete(s.ID())
+	s.peer.sessHub.delete(s.ID())
 
 	var reason string
 	if err != nil && err != socket.ErrProactivelyCloseSocket {
@@ -959,8 +959,8 @@ func newSessionHub() *SessionHub {
 	return chub
 }
 
-// Set sets a *session.
-func (sh *SessionHub) Set(sess *session) {
+// set sets a *session.
+func (sh *SessionHub) set(sess *session) {
 	_sess, loaded := sh.sessions.LoadOrStore(sess.ID(), sess)
 	if !loaded {
 		return
@@ -971,42 +971,42 @@ func (sh *SessionHub) Set(sess *session) {
 	}
 }
 
-// Get gets *session by id.
+// get gets *session by id.
 // If second returned arg is false, mean the *session is not found.
-func (sh *SessionHub) Get(id string) (*session, bool) {
+func (sh *SessionHub) get(id string) (*session, bool) {
 	_sess, ok := sh.sessions.Load(id)
 	if !ok {
 		return nil, false
 	}
 	return _sess.(*session), true
 }
 
-// Range calls f sequentially for each id and *session present in the session hub.
+// rangeCallback calls f sequentially for each id and *session present in the session hub.
 // If fn returns false, stop traversing.
-func (sh *SessionHub) Range(fn func(*session) bool) {
+func (sh *SessionHub) rangeCallback(fn func(*session) bool) {
 	sh.sessions.Range(func(key, value interface{}) bool {
 		return fn(value.(*session))
 	})
 }
 
-// Random gets a *session randomly.
+// random gets a *session randomly.
 // If second returned arg is false, mean no *session is exist.
-func (sh *SessionHub) Random() (*session, bool) {
+func (sh *SessionHub) random() (*session, bool) {
 	_, sess, exist := sh.sessions.Random()
 	if !exist {
 		return nil, false
 	}
 	return sess.(*session), true
 }
 
-// Len returns the length of the session hub.
+// len returns the length of the session hub.
 // NOTE: the count implemented using sync.Map may be inaccurate.
-func (sh *SessionHub) Len() int {
+func (sh *SessionHub) len() int {
 	return sh.sessions.Len()
 }
 
-// Delete deletes the *session for a id.
-func (sh *SessionHub) Delete(id string) {
+// delete deletes the *session for a id.
+func (sh *SessionHub) delete(id string) {
 	sh.sessions.Delete(id)
 }