This is an automated email from the ASF dual-hosted git repository.
AlexStocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go-pixiu.git
The following commit(s) were added to refs/heads/develop by this push:
new 0765f2579 refactor(admin): remove personal fork dependency
v.marlon.life/toolkit (#984)
0765f2579 is described below
commit 0765f2579c88c52be8e3fa203b23491966c9dc10
Author: aias00 <[email protected]>
AuthorDate: Sat Jul 11 16:40:47 2026 +0800
refactor(admin): remove personal fork dependency v.marlon.life/toolkit
(#984)
* refactor(admin): remove personal fork dependency v.marlon.life/toolkit
Replace util.WaitGroupWrapper with standard sync.WaitGroup.
The dependency was used only for WaitGroupWrapper which is a thin
wrapper around sync.WaitGroup. Using the standard library directly
eliminates a personal-domain dependency with no stability guarantees
and addresses Apache project compliance concerns.
Co-Authored-By: Claude <[email protected]>
* style(admin): fix import grouping for sync package
Move 'sync' into the standard library import block to satisfy
the imports-formatter CI check.
Co-Authored-By: Claude <[email protected]>
---------
Co-authored-by: Claude <[email protected]>
---
admin/core/server.go | 17 ++++++++++-------
go.mod | 1 -
go.sum | 2 --
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/admin/core/server.go b/admin/core/server.go
index 994f72ff6..737212abf 100644
--- a/admin/core/server.go
+++ b/admin/core/server.go
@@ -20,12 +20,11 @@ package core
import (
"fmt"
"net/http"
+ "sync"
)
import (
"go.uber.org/zap"
-
- "v.marlon.life/toolkit/util"
)
import (
@@ -64,23 +63,27 @@ func RunServer() {
s := initServer(address, router)
- var wg util.WaitGroupWrapper
+ var wg sync.WaitGroup
- wg.AddAndRun(func() {
+ wg.Add(1)
+ go func() {
+ defer wg.Done()
global.LOG.Info("server run success on ", zap.String("address",
address))
fmt.Printf(helperInfo, address)
if err := s.ListenAndServe(); err != nil && err !=
http.ErrServerClosed {
global.LOG.Error(err.Error())
}
- })
+ }()
- wg.AddAndRun(func() {
+ wg.Add(1)
+ go func() {
+ defer wg.Done()
global.LOG.Info("xDS server run success on :18000")
if err := StartxDsServer(); err != nil {
global.LOG.Error(err.Error())
}
- })
+ }()
wg.Wait()
}
diff --git a/go.mod b/go.mod
index dd02bee08..4524ad9b4 100644
--- a/go.mod
+++ b/go.mod
@@ -71,7 +71,6 @@ require (
gopkg.in/yaml.v3 v3.0.1
gorm.io/gorm v1.30.0
mosn.io/proxy-wasm-go-host v0.1.0
- v.marlon.life/toolkit v0.0.0-20211025131614-e4a91730b4ab
)
// Pin v2.0.2 to match github.com/go-openapi/spec v0.22.1 test dependencies
diff --git a/go.sum b/go.sum
index ab5776eda..4b221a73c 100644
--- a/go.sum
+++ b/go.sum
@@ -1814,5 +1814,3 @@ sigs.k8s.io/yaml v1.2.0/go.mod
h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod
h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
-v.marlon.life/toolkit v0.0.0-20211025131614-e4a91730b4ab
h1:a6cEnTfYq9TiNuFyvtyGsQ/05FfG6W1FkR61o4sWfMk=
-v.marlon.life/toolkit v0.0.0-20211025131614-e4a91730b4ab/go.mod
h1:v4RzgEKUNEmIL9GEsV1AbChohLekk/qSK+Ed2Ho0R84=
