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

Merge pull request #1529 from c9s/narumi/atrpin/log2

Browse Source 
CHORE: [atrpin] modify log again
This commit is contained in:
なるみ 2024-02-07 02:36:40 +08:00 committed by GitHub
commit d34a4100ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/strategy/atrpin/strategy.go
View File

@ -39,9 +39,6 @@ type Strategy struct {
func (s *Strategy) Initialize() error {
s.Strategy = &common.Strategy{}
log = log.WithField("symbol", s.Symbol)
return nil
}
@ -122,19 +119,16 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor bbgo.OrderExecutor, se
position := s.Strategy.OrderExecutor.Position()
log.Infof("position: %+v", position)
if !position.IsDust() {
log.Infof("position is not dust")
side := types.SideTypeSell
takerPrice := fixedpoint.Zero
side := types.SideTypeBuy
takerPrice := ticker.Sell
if position.IsLong() {
side = types.SideTypeSell
takerPrice = ticker.Buy
}
if position.IsShort() {
side = types.SideTypeBuy
takerPrice = ticker.Sell
} else if position.IsLong() {
side = types.SideTypeSell
takerPrice = ticker.Buy
}
if !position.IsDust(takerPrice) {
log.Infof("%s position is not dust", s.Symbol)
orderForms = append(orderForms, types.SubmitOrder{
Symbol: s.Symbol,
@ -150,7 +144,7 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor bbgo.OrderExecutor, se
log.Infof("SUBMIT TAKER ORDER: %+v", orderForms)
if _, err := s.Strategy.OrderExecutor.SubmitOrders(ctx, orderForms...); err != nil {
log.WithError(err).Error("unable to submit orders")
log.WithError(err).Errorf("unable to submit orders: %+v", orderForms)
}
return
@ -184,14 +178,14 @@ func (s *Strategy) Run(ctx context.Context, orderExecutor bbgo.OrderExecutor, se
}
if len(orderForms) == 0 {
log.Infof("no order to place")
log.Infof("no %s order to place", s.Symbol)
return
}
log.Infof("bid/ask: %f/%f", bidPrice.Float64(), askPrice.Float64())
log.Infof("%s bid/ask: %f/%f", s.Symbol, bidPrice.Float64(), askPrice.Float64())
if _, err := s.Strategy.OrderExecutor.SubmitOrders(ctx, orderForms...); err != nil {
log.WithError(err).Error("unable to submit orders")
log.WithError(err).Errorf("unable to submit orders: %+v", orderForms)
}
}))