From fbfacc82cdee37942bb699417cf740408d49b571 Mon Sep 17 00:00:00 2001 From: Evstigneev Denis Date: Tue, 12 Mar 2024 23:13:55 +0300 Subject: [PATCH] update type for WaitGroup in server (#324) ## Pull Request template Please, go through these steps before clicking submit on this PR. 1. Give a descriptive title to your PR. 2. Provide a description of your changes. 3. Make sure you have some relevant tests. 4. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes (if applicable). **PLEASE REMOVE THIS TEMPLATE BEFORE SUBMITTING** Reviewed-on: https://git.unistack.org/unistack-org/micro/pulls/324 Co-authored-by: Evstigneev Denis Co-committed-by: Evstigneev Denis --- server/options.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/server/options.go b/server/options.go index 8499438b..ca61d9d7 100644 --- a/server/options.go +++ b/server/options.go @@ -13,6 +13,7 @@ import ( "go.unistack.org/micro/v4/meter" "go.unistack.org/micro/v4/options" "go.unistack.org/micro/v4/register" + msync "go.unistack.org/micro/v4/sync" "go.unistack.org/micro/v4/tracer" "go.unistack.org/micro/v4/util/id" ) @@ -32,7 +33,7 @@ type Options struct { // Listener may be passed if already created Listener net.Listener // Wait group - Wait *sync.WaitGroup + Wait *msync.WaitGroup // TLSConfig specifies tls.Config for secure serving TLSConfig *tls.Config // Metadata holds the server metadata @@ -146,8 +147,11 @@ func Wait(wg *sync.WaitGroup) options.Option { if wg == nil { wg = new(sync.WaitGroup) } + + wrap := msync.WrapWaitGroup(wg) + return func(src interface{}) error { - return options.Set(src, wg, ".Wait") + return options.Set(src, wrap, ".Wait") } }