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

update type for WaitGroup in server #324

Merged
vtolstov merged 2 commits from devstigneev/micro:waitGroup into master 2024-03-12 23:13:56 +03:00
Conversation 0 Commits 2 Files Changed 1 +6 -2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/options.go
View File

@@ -13,6 +13,7 @@ import (
"go.unistack.org/micro/v4/meter" "go.unistack.org/micro/v4/meter"
"go.unistack.org/micro/v4/options" "go.unistack.org/micro/v4/options"
"go.unistack.org/micro/v4/register" "go.unistack.org/micro/v4/register"
msync "go.unistack.org/micro/v4/sync"
"go.unistack.org/micro/v4/tracer" "go.unistack.org/micro/v4/tracer"
"go.unistack.org/micro/v4/util/id" "go.unistack.org/micro/v4/util/id"
) )
@@ -32,7 +33,7 @@ type Options struct {
// Listener may be passed if already created // Listener may be passed if already created
Listener net.Listener Listener net.Listener
// Wait group // Wait group
Wait *sync.WaitGroup Wait *msync.WaitGroup
// TLSConfig specifies tls.Config for secure serving // TLSConfig specifies tls.Config for secure serving
TLSConfig *tls.Config TLSConfig *tls.Config
// Metadata holds the server metadata // Metadata holds the server metadata
@@ -146,8 +147,11 @@ func Wait(wg *sync.WaitGroup) options.Option {
if wg == nil { if wg == nil {
wg = new(sync.WaitGroup) wg = new(sync.WaitGroup)
} }
wrap := msync.WrapWaitGroup(wg)
return func(src interface{}) error { return func(src interface{}) error {
return options.Set(src, wg, ".Wait") return options.Set(src, wrap, ".Wait")
} }
} }