Merge pull request #9 from 2SE/develop

fix some bugs

core/router/appclients.go

@@ -68,7 +68,7 @@ func (s *resourcesPool) errRecovery() {
 						logFieldKey: "errRecovery",
 					}).Tracef("appclient %s was removed\n", k)
 				}
-				s.connErr[k] = 0
+				s.connErrClear(k)
 			}
 			ch <- struct{}{}
 		})
@@ -81,11 +81,23 @@ func (s *resourcesPool) healthCheck() {
 		ticker.AfterFunc(s.heartBeat, func() {
 			for k, v := range s.conns {
 				if v.GetState() == connectivity.TransientFailure {
-					s.connErr[k]++
+					s.connErrInc(k)
 				}
 			}
 			ch <- struct{}{}
 		})
 		<-ch
 	}
 }
+
+func (s *resourcesPool) connErrInc(key string) {
+	s.m.Lock()
+	defer s.m.Unlock()
+	s.connErr[key]++
+}
+
+func (s *resourcesPool) connErrClear(key string) {
+	s.m.Lock()
+	defer s.m.Unlock()
+	s.connErr[key] = 0
+}

core/router/router.go

@@ -76,7 +76,7 @@ func (s *resourcesPool) Register(mps []core.MethodPath, pr core.PeerRouter, addr
 		if s.pRAddr[pr.String()] == address {
 			log.WithFields(log.Fields{
 				logFieldKey: "Register",
-			}).Warnf("the address %s registered again when it not shutdown")
+			}).Warnf("the address %s registered again when it not shutdown", address)
 			return nil
 		}
 		err := s.TryAddClient(address)
@@ -124,9 +124,9 @@ func (s *resourcesPool) UnRegisterApp(pr core.PeerRouter) {
 		prs.RemoveByPeerRouter(pr)
 	}
 	if address, ok := s.pRAddr[pr.String()]; ok {
-		delete(s.pRAddr, pr.String())
 		delete(s.addrPR, address)
 		s.RemoveClient(address)
+		delete(s.pRAddr, pr.String())
 	}
 	s.localPeer.Notify(pr)
 }

pb/login.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package user;
+package pb;
 import "google/protobuf/any.proto";