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

xmaker: use report ticker to report profit stats

Browse Source
This commit is contained in:
c9s 2021-10-14 08:53:44 +08:00
parent 77f11f4515
commit e2f58d0466
1 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/strategy/xmaker/strategy.go
View File

@ -635,27 +635,7 @@ func (s *Strategy) processTrade(trade types.Trade) {
Time: trade.Time.Time(), Time: trade.Time.Time(),
} }
s.state.ProfitStats.AddProfit(p) s.state.ProfitStats.AddProfit(p)
since := time.Unix(s.state.ProfitStats.AccumulatedSince, 0).Local()
s.Notify(&p) s.Notify(&p)
s.Notify(
"today %s profit %f %s,\n"+
"today %s net profit %f %s,\n"+
"today %s trade loss %f %s\n"+
"accumulated profit %f %s,\n"+
"accumulated net profit %f %s,\n"+
"accumulated trade loss %f %s\n"+
"since %s",
s.Symbol, s.state.ProfitStats.TodayPnL.Float64(), s.state.Position.QuoteCurrency,
s.Symbol, s.state.ProfitStats.TodayNetProfit.Float64(), s.state.Position.QuoteCurrency,
s.Symbol, s.state.ProfitStats.TodayLoss.Float64(), s.state.Position.QuoteCurrency,
s.state.ProfitStats.AccumulatedPnL.Float64(), s.state.Position.QuoteCurrency,
s.state.ProfitStats.AccumulatedNetProfit.Float64(), s.state.Position.QuoteCurrency,
s.state.ProfitStats.AccumulatedLoss.Float64(), s.state.Position.QuoteCurrency,
since.Format(time.RFC822),
)
} else { } else {
log.Infof("position changed: %s", s.state.Position) log.Infof("position changed: %s", s.state.Position)
s.Notify(s.state.Position) s.Notify(s.state.Position)
@ -856,6 +836,9 @@ func (s *Strategy) CrossRun(ctx context.Context, orderExecutionRouter bbgo.Order
quoteTicker := time.NewTicker(durationJitter(s.UpdateInterval.Duration(), 200)) quoteTicker := time.NewTicker(durationJitter(s.UpdateInterval.Duration(), 200))
defer quoteTicker.Stop() defer quoteTicker.Stop()
reportTicker := time.NewTicker(time.Hour)
defer reportTicker.Stop()
defer func() { defer func() {
if err := s.makerSession.Exchange.CancelOrders(context.Background(), s.activeMakerOrders.Orders()...); err != nil { if err := s.makerSession.Exchange.CancelOrders(context.Background(), s.activeMakerOrders.Orders()...); err != nil {
log.WithError(err).Errorf("can not cancel %s orders", s.Symbol) log.WithError(err).Errorf("can not cancel %s orders", s.Symbol)
@ -876,6 +859,9 @@ func (s *Strategy) CrossRun(ctx context.Context, orderExecutionRouter bbgo.Order
case <-quoteTicker.C: case <-quoteTicker.C:
s.updateQuote(ctx, orderExecutionRouter) s.updateQuote(ctx, orderExecutionRouter)
case <-reportTicker.C:
s.Notifiability.Notify(&s.state.ProfitStats)
case trade := <-s.tradeC: case trade := <-s.tradeC:
log.Infof("recieved trade %+v", trade) log.Infof("recieved trade %+v", trade)
if s.orderStore.Exists(trade.OrderID) { if s.orderStore.Exists(trade.OrderID) {