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

call bbgo.Sync to sync persistence

Browse Source
This commit is contained in:
c9s 2022-06-21 15:57:26 +08:00
parent 5b239ad8ee
commit 6ef54bf2fb
No known key found for this signature in database
GPG Key ID: 7385E7E464CB0A54
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/bbgo/persistence.go
View File

@ -91,14 +91,18 @@ func (p *Persistence) Sync(obj interface{}) error {
} }
// Sync syncs the object properties into the persistence layer // Sync syncs the object properties into the persistence layer
func Sync(obj interface{}) error { func Sync(obj interface{}) {
id := callID(obj) id := callID(obj)
if len(id) == 0 { if len(id) == 0 {
return nil log.Warnf("InstanceID() is not provided, can not sync persistence")
return
} }
ps := PersistenceServiceFacade.Get() ps := PersistenceServiceFacade.Get()
return storePersistenceFields(obj, id, ps) err := storePersistenceFields(obj, id, ps)
if err != nil {
log.WithError(err).Errorf("persistence sync failed")
}
} }
func loadPersistenceFields(obj interface{}, id string, persistence service.PersistenceService) error { func loadPersistenceFields(obj interface{}, id string, persistence service.PersistenceService) error {

6
pkg/strategy/bollmaker/strategy.go
View File

@ -494,7 +494,7 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor bbgo.OrderExecutor, se
s.OnSuspend(func() { s.OnSuspend(func() {
s.Status = types.StrategyStatusStopped s.Status = types.StrategyStatusStopped
_ = s.orderExecutor.GracefulCancel(ctx) _ = s.orderExecutor.GracefulCancel(ctx)
_ = s.Persistence.Sync(s) bbgo.Sync(s)
}) })
s.OnEmergencyStop(func() { s.OnEmergencyStop(func() {
@ -578,9 +578,7 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor bbgo.OrderExecutor, se
// TODO: migrate persistance to singleton // TODO: migrate persistance to singleton
s.orderExecutor.TradeCollector().OnPositionUpdate(func(position *types.Position) { s.orderExecutor.TradeCollector().OnPositionUpdate(func(position *types.Position) {
if err := s.Persistence.Sync(s); err != nil { bbgo.Sync(s)
log.WithError(err).Errorf("can not sync state to persistence")
}
}) })
s.SmartStops.RunStopControllers(ctx, session, s.orderExecutor.TradeCollector()) s.SmartStops.RunStopControllers(ctx, session, s.orderExecutor.TradeCollector())

3
pkg/strategy/pivotshort/strategy.go
View File

@ -231,6 +231,9 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor bbgo.OrderExecutor, se
s.orderExecutor.BindEnvironment(s.Environment) s.orderExecutor.BindEnvironment(s.Environment)
s.orderExecutor.BindProfitStats(s.ProfitStats) s.orderExecutor.BindProfitStats(s.ProfitStats)
s.orderExecutor.BindTradeStats(s.TradeStats) s.orderExecutor.BindTradeStats(s.TradeStats)
s.orderExecutor.TradeCollector().OnPositionUpdate(func(position *types.Position) {
bbgo.Sync(s)
})
s.orderExecutor.Bind() s.orderExecutor.Bind()
store, _ := session.MarketDataStore(s.Symbol) store, _ := session.MarketDataStore(s.Symbol)

7
pkg/strategy/supertrend/strategy.go
View File

@ -3,9 +3,10 @@ package supertrend
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/c9s/bbgo/pkg/util"
"sync" "sync"
"github.com/c9s/bbgo/pkg/util"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
@ -256,9 +257,7 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor bbgo.OrderExecutor, se
// Sync position to redis on trade // Sync position to redis on trade
s.orderExecutor.TradeCollector().OnPositionUpdate(func(position *types.Position) { s.orderExecutor.TradeCollector().OnPositionUpdate(func(position *types.Position) {
if err := s.Persistence.Sync(s); err != nil { bbgo.Sync(s)
log.WithError(err).Errorf("can not sync state to persistence")
}
}) })
s.stopC = make(chan struct{}) s.stopC = make(chan struct{})

2
pkg/strategy/support/strategy.go
View File

@ -352,7 +352,7 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor bbgo.OrderExecutor, se
s.OnSuspend(func() { s.OnSuspend(func() {
// Cancel all order // Cancel all order
_ = s.orderExecutor.GracefulCancel(ctx) _ = s.orderExecutor.GracefulCancel(ctx)
_ = s.Persistence.Sync(s) bbgo.Sync(s)
}) })
s.OnEmergencyStop(func() { s.OnEmergencyStop(func() {