lychiyu/bbgo_origin
1
0
Fork 0
mirror of https://github.com/c9s/bbgo.git synced 2024-11-22 06:53:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #703 from c9s/fix/sync-goroutine-leak

Browse Source 
fix: syncing goroutine leak
This commit is contained in:
Yo-An Lin 2022-06-10 16:47:02 +08:00 committed by GitHub
commit 2bab2103e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/server/routes.go
View File

@ -48,7 +48,7 @@ type Server struct {
srv *http.Server
}
func (s *Server) newEngine() *gin.Engine {
func (s *Server) newEngine(ctx context.Context) *gin.Engine {
r := gin.Default()
r.Use(cors.New(cors.Config{
AllowOrigins: []string{"*"},
@ -77,11 +77,15 @@ func (s *Server) newEngine() *gin.Engine {
})
r.POST("/api/environment/sync", func(c *gin.Context) {
go func() {
if err := s.Environ.Sync(context.Background()); err != nil {
logrus.WithError(err).Error("sync error")
}
}()
if s.Environ.IsSyncing() == bbgo.SyncDone {
go func() {
// We use the root context here because the syncing operation is a background goroutine.
// It should not be terminated if the request is disconnected.
if err := s.Environ.Sync(ctx); err != nil {
logrus.WithError(err).Error("sync error")
}
}()
}
c.JSON(http.StatusOK, gin.H{
"success": true,
@ -249,7 +253,7 @@ func (s *Server) newEngine() *gin.Engine {
}
func (s *Server) RunWithListener(ctx context.Context, l net.Listener) error {
r := s.newEngine()
r := s.newEngine(ctx)
bind := l.Addr().String()
if s.OpenInBrowser {
@ -261,7 +265,7 @@ func (s *Server) RunWithListener(ctx context.Context, l net.Listener) error {
}
func (s *Server) Run(ctx context.Context, bindArgs ...string) error {
r := s.newEngine()
r := s.newEngine(ctx)
bind := resolveBind(bindArgs)
if s.OpenInBrowser {
openBrowser(ctx, bind)