go/go-micro
1
0
Fork 0
mirror of https://github.com/go-micro/go-micro.git synced 2024-11-24 08:02:32 +02:00
Code Issues Releases Activity

Revert "server/grpc: fix ordering of register and check for registered (#1338)" (#1341)

Browse Source 
This reverts commit 62a644ddd8.
This commit is contained in:
Vasiliy Tolstov 2020-03-13 12:30:44 +03:00 committed by GitHub
parent 078dd4eb9b
commit fbde872e7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server/grpc/grpc.go
View File

@ -659,12 +659,10 @@ func (g *grpcServer) Register() error {
registered := g.registered
g.Unlock()
if registered {
return nil
}
if logger.V(logger.InfoLevel, logger.DefaultLogger) {
logger.Infof("Registry [%s] Registering node: %s", config.Registry.String(), node.Id)
if !registered {
if logger.V(logger.InfoLevel, logger.DefaultLogger) {
logger.Infof("Registry [%s] Registering node: %s", config.Registry.String(), node.Id)
}
}
// create registry options
@ -674,6 +672,11 @@ func (g *grpcServer) Register() error {
return err
}
// already registered? don't need to register subscribers
if registered {
return nil
}
g.Lock()
defer g.Unlock()
@ -784,10 +787,10 @@ func (g *grpcServer) Start() error {
g.RUnlock()
return nil
}
config := g.Options()
g.RUnlock()
config := g.Options()
// micro: config.Transport.Listen(config.Address)
var ts net.Listener
@ -819,11 +822,10 @@ func (g *grpcServer) Start() error {
}
g.Lock()
g.opts.Address = ts.Addr().String()
subscribes := g.subscribers
g.Unlock()
// only connect if we're subscribed
if len(subscribes) > 0 {
if len(g.subscribers) > 0 {
// connect to the broker
if err := config.Broker.Connect(); err != nil {
return err