go/go-micro
1
0
Fork 0
mirror of https://github.com/go-micro/go-micro.git synced 2024-12-24 10:07:04 +02:00
Code Issues Releases Activity

Unlock on return from network.Connect

Browse Source
This commit is contained in:
Milos Gajdos 2019-09-13 03:31:58 +01:00
parent b91c3147e7
commit d72e91fb38
No known key found for this signature in database
GPG Key ID: 8B31058CC55DFD4F
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
network/default.go
View File

@ -676,12 +676,14 @@ func (n *network) advertise(client transport.Client, advertChan <-chan *router.A
// Connect connects the network // Connect connects the network
func (n *network) Connect() error { func (n *network) Connect() error {
n.Lock() n.RLock()
// return if already connected // return if already connected
if n.connected { if n.connected {
n.RUnlock()
return nil return nil
} }
n.Lock()
// try to resolve network nodes // try to resolve network nodes
nodes, err := n.resolveNodes() nodes, err := n.resolveNodes()
if err != nil { if err != nil {
@ -690,6 +692,7 @@ func (n *network) Connect() error {
// connect network tunnel // connect network tunnel
if err := n.Tunnel.Connect(); err != nil { if err := n.Tunnel.Connect(); err != nil {
n.Unlock()
return err return err
} }
@ -701,6 +704,7 @@ func (n *network) Connect() error {
// dial into ControlChannel to send route adverts // dial into ControlChannel to send route adverts
ctrlClient, err := n.Tunnel.Dial(ControlChannel, tunnel.DialMulticast()) ctrlClient, err := n.Tunnel.Dial(ControlChannel, tunnel.DialMulticast())
if err != nil { if err != nil {
n.Unlock()
return err return err
} }
@ -709,12 +713,14 @@ func (n *network) Connect() error {
// listen on ControlChannel // listen on ControlChannel
ctrlListener, err := n.Tunnel.Listen(ControlChannel) ctrlListener, err := n.Tunnel.Listen(ControlChannel)
if err != nil { if err != nil {
n.Unlock()
return err return err
} }
// dial into NetworkChannel to send network messages // dial into NetworkChannel to send network messages
netClient, err := n.Tunnel.Dial(NetworkChannel, tunnel.DialMulticast()) netClient, err := n.Tunnel.Dial(NetworkChannel, tunnel.DialMulticast())
if err != nil { if err != nil {
n.Unlock()
return err return err
} }
@ -723,6 +729,7 @@ func (n *network) Connect() error {
// listen on NetworkChannel // listen on NetworkChannel
netListener, err := n.Tunnel.Listen(NetworkChannel) netListener, err := n.Tunnel.Listen(NetworkChannel)
if err != nil { if err != nil {
n.Unlock()
return err return err
} }
@ -731,17 +738,20 @@ func (n *network) Connect() error {
// start the router // start the router
if err := n.options.Router.Start(); err != nil { if err := n.options.Router.Start(); err != nil {
n.Unlock()
return err return err
} }
// start advertising routes // start advertising routes
advertChan, err := n.options.Router.Advertise() advertChan, err := n.options.Router.Advertise()
if err != nil { if err != nil {
n.Unlock()
return err return err
} }
// start the server // start the server
if err := n.server.Start(); err != nil { if err := n.server.Start(); err != nil {
n.Unlock()
return err return err
} }
n.Unlock() n.Unlock()