diff --git a/pkg/strategy/atrpin/strategy.go b/pkg/strategy/atrpin/strategy.go index d95b02dddd..87b8bdf49c 100644 --- a/pkg/strategy/atrpin/strategy.go +++ b/pkg/strategy/atrpin/strategy.go @@ -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 - - if position.IsShort() { - side = types.SideTypeBuy - takerPrice = ticker.Sell - } else if position.IsLong() { - side = types.SideTypeSell - takerPrice = ticker.Buy - } + + side := types.SideTypeBuy + takerPrice := ticker.Sell + 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) } }))