unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 2 Actions 4 Packages Projects Releases 260 Wiki Activity

Merge pull request 'v3 update WaitGroup Options' (#325) from devstigneev/micro:v3 into v3

Browse Source 
Reviewed-on: #325
This commit is contained in:
Василий Толстов 2024-03-13 11:03:29 +03:00
commit 21bf9ff0ec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/options.go
View File

@ -15,6 +15,7 @@ import (
"go.unistack.org/micro/v3/network/transport" "go.unistack.org/micro/v3/network/transport"
"go.unistack.org/micro/v3/options" "go.unistack.org/micro/v3/options"
"go.unistack.org/micro/v3/register" "go.unistack.org/micro/v3/register"
msync "go.unistack.org/micro/v3/sync"
"go.unistack.org/micro/v3/tracer" "go.unistack.org/micro/v3/tracer"
"go.unistack.org/micro/v3/util/id" "go.unistack.org/micro/v3/util/id"
) )
@ -47,7 +48,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
@ -282,7 +283,7 @@ func Wait(wg *sync.WaitGroup) Option {
if wg == nil { if wg == nil {
wg = new(sync.WaitGroup) wg = new(sync.WaitGroup)
} }
o.Wait = wg o.Wait = msync.WrapWaitGroup(wg)
} }
} }
@ -331,7 +332,6 @@ func GracefulTimeout(td time.Duration) Option {
} }
} }
// HandlerOptions struct // HandlerOptions struct
type HandlerOptions struct { type HandlerOptions struct {
// Context holds external options // Context holds external options