unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

Merge pull request #585 from unistack-org/transport2

Browse Source 
transport memory: fix races
This commit is contained in:
Asim Aslam
2019-07-13 19:38:22 -07:00
committed by GitHub
parent 2fecde1dbb 81d2259fac
commit a549f92dec
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
transport/memory/memory.go
View File

@@ -12,10 +12,6 @@ import (
"github.com/micro/go-micro/transport" "github.com/micro/go-micro/transport"
) )
var (
r = rand.New(rand.NewSource(time.Now().UnixNano()))
)
type memorySocket struct { type memorySocket struct {
recv chan *transport.Message recv chan *transport.Message
send chan *transport.Message send chan *transport.Message
@@ -178,7 +174,7 @@ func (m *memoryTransport) Listen(addr string, opts ...transport.ListenOption) (t
// if zero port then randomly assign one // if zero port then randomly assign one
if len(parts) > 1 && parts[len(parts)-1] == "0" { if len(parts) > 1 && parts[len(parts)-1] == "0" {
i := r.Intn(10000) i := rand.Intn(20000)
// set addr with port // set addr with port
addr = fmt.Sprintf("%s:%d", parts[:len(parts)-1], 10000+i) addr = fmt.Sprintf("%s:%d", parts[:len(parts)-1], 10000+i)
} }
@@ -215,6 +211,7 @@ func (m *memoryTransport) String() string {
} }
func NewTransport(opts ...transport.Option) transport.Transport { func NewTransport(opts ...transport.Option) transport.Transport {
rand.Seed(time.Now().UnixNano())
var options transport.Options var options transport.Options
for _, o := range opts { for _, o := range opts {
o(&options) o(&options)