diff --git a/data/evmrepo/get_tx.go b/data/evmrepo/get_tx.go index 5dc37a4..0c84bd6 100644 --- a/data/evmrepo/get_tx.go +++ b/data/evmrepo/get_tx.go @@ -42,7 +42,7 @@ func (e *evmRepository) GetTx(ctx context.Context, id string) (*models.Tx, error } if pending { - logctx.Info(ctx, "Transaction %q is pending", logger.String("txHash", txHash.String())) + logctx.Debug(ctx, "Transaction %q is pending", logger.String("txHash", txHash.String())) return &models.Tx{ Status: models.TX_PENDING, TxHash: tx.Hash().Hex(), diff --git a/data/redisrepo/cancel_orders_for_user.go b/data/redisrepo/cancel_orders_for_user.go index e5ffeea..b84975d 100644 --- a/data/redisrepo/cancel_orders_for_user.go +++ b/data/redisrepo/cancel_orders_for_user.go @@ -80,6 +80,6 @@ func (r *redisRepository) CancelOrdersForUser(ctx context.Context, userId uuid.U logctx.Error(ctx, "encountered order in an unexpected state when cancelling all orders for user", logger.String("orderId", order.Id.String()), logger.String("size", order.Size.String()), logger.String("sizeFilled", order.SizeFilled.String()), logger.String("sizePending", order.SizePending.String())) } - logctx.Info(ctx, "removed all orders for user", logger.String("userId", userId.String()), logger.Int("numOrders", len(ordersToCancel))) + logctx.Debug(ctx, "removed all orders for user", logger.String("userId", userId.String()), logger.Int("numOrders", len(ordersToCancel))) return orderIds, nil } diff --git a/data/redisrepo/cancel_partial_filled_order.go b/data/redisrepo/cancel_partial_filled_order.go index bafffdb..f557520 100644 --- a/data/redisrepo/cancel_partial_filled_order.go +++ b/data/redisrepo/cancel_partial_filled_order.go @@ -61,6 +61,6 @@ func (r *redisRepository) CancelPartialFilledOrder(ctx context.Context, order mo } // --- END TRANSACTION --- - logctx.Info(ctx, "cancelled partial filled order", logger.String("userId", order.UserId.String()), logger.String("orderId", order.Id.String()), logger.String("price", order.Price.String()), logger.String("size", order.Size.String()), logger.String("side", order.Side.String())) + logctx.Debug(ctx, "cancelled partial filled order", logger.String("userId", order.UserId.String()), logger.String("orderId", order.Id.String()), logger.String("price", order.Price.String()), logger.String("size", order.Size.String()), logger.String("side", order.Side.String())) return nil } diff --git a/data/redisrepo/cancel_pending_order.go b/data/redisrepo/cancel_pending_order.go index 87804b4..39a526d 100644 --- a/data/redisrepo/cancel_pending_order.go +++ b/data/redisrepo/cancel_pending_order.go @@ -43,6 +43,6 @@ func (r *redisRepository) CancelPendingOrder(ctx context.Context, order models.O } // --- END TRANSACTION --- - logctx.Info(ctx, "cancelled pending order", logger.String("userId", order.UserId.String()), logger.String("orderId", order.Id.String()), logger.String("price", order.Price.String()), logger.String("size", order.Size.String()), logger.String("side", order.Side.String())) + logctx.Debug(ctx, "cancelled pending order", logger.String("userId", order.UserId.String()), logger.String("orderId", order.Id.String()), logger.String("price", order.Price.String()), logger.String("size", order.Size.String()), logger.String("side", order.Side.String())) return nil } diff --git a/data/redisrepo/find_orders_by_ids.go b/data/redisrepo/find_orders_by_ids.go index e01fbdc..5ac70b0 100644 --- a/data/redisrepo/find_orders_by_ids.go +++ b/data/redisrepo/find_orders_by_ids.go @@ -67,6 +67,6 @@ func (r *redisRepository) FindOrdersByIds(ctx context.Context, ids []uuid.UUID, } } - logctx.Info(ctx, "found orders by IDs", logger.Int("numIdsProvided", len(ids)), logger.Int("numOrders", len(orders))) + logctx.Debug(ctx, "found orders by IDs", logger.Int("numIdsProvided", len(ids)), logger.Int("numOrders", len(orders))) return orders, nil } diff --git a/data/redisrepo/get_market_depth.go b/data/redisrepo/get_market_depth.go index fed7906..c72e383 100644 --- a/data/redisrepo/get_market_depth.go +++ b/data/redisrepo/get_market_depth.go @@ -89,7 +89,7 @@ func (r *redisRepository) GetMarketDepth(ctx context.Context, symbol models.Symb } } - logctx.Info(ctx, "fetched market depth", logger.String("symbol", symbol.String()), logger.Int("depth", depth), logger.Int("numAsks", len(marketDepth.Asks)), logger.Int("numBids", len(marketDepth.Bids))) + logctx.Debug(ctx, "fetched market depth", logger.String("symbol", symbol.String()), logger.Int("depth", depth), logger.Int("numAsks", len(marketDepth.Asks)), logger.Int("numBids", len(marketDepth.Bids))) return marketDepth, nil } @@ -111,6 +111,6 @@ func (r *redisRepository) fetchOrderIds(ctx context.Context, key string, depth i orderIds[i] = orderId } - logctx.Info(ctx, "fetched order IDs", logger.String("key", key), logger.Int("depth", depth), logger.Int("numOrders", len(orderIds))) + logctx.Debug(ctx, "fetched order IDs", logger.String("key", key), logger.Int("depth", depth), logger.Int("numOrders", len(orderIds))) return orderIds, nil } diff --git a/data/redisrepo/get_orders_for_user.go b/data/redisrepo/get_orders_for_user.go index 4161da0..a9e9f2a 100644 --- a/data/redisrepo/get_orders_for_user.go +++ b/data/redisrepo/get_orders_for_user.go @@ -21,10 +21,10 @@ func (r *redisRepository) GetOrdersForUser(ctx context.Context, userId uuid.UUID var key string if isFilledOrders { - logctx.Info(ctx, "getting filled orders for user", logger.String("userId", userId.String())) + logctx.Debug(ctx, "getting filled orders for user", logger.String("userId", userId.String())) key = CreateUserFilledOrdersKey(userId) } else { - logctx.Info(ctx, "getting open orders for user", logger.String("userId", userId.String())) + logctx.Debug(ctx, "getting open orders for user", logger.String("userId", userId.String())) key = CreateUserOpenOrdersKey(userId) } @@ -71,6 +71,6 @@ func (r *redisRepository) GetOrdersForUser(ctx context.Context, userId uuid.UUID ordersSlice = append(ordersSlice, o...) } - logctx.Info(ctx, "got orders for user", logger.String("userId", userId.String()), logger.Int("count", len(orders))) + logctx.Debug(ctx, "got orders for user", logger.String("userId", userId.String()), logger.Int("count", len(orders))) return ordersSlice, totalOrders, nil } diff --git a/data/redisrepo/store_filled_orders.go b/data/redisrepo/store_filled_orders.go index 0f88d86..acafe45 100644 --- a/data/redisrepo/store_filled_orders.go +++ b/data/redisrepo/store_filled_orders.go @@ -29,7 +29,7 @@ func (r *redisRepository) StoreFilledOrders(ctx context.Context, orders []models return fmt.Errorf("failed to store filled orders in Redis: %v", err) } - logctx.Info(ctx, "stored filled orders in Redis", logger.Strings("orderIds", models.OrderIdsToStrings(ctx, &orders))) + logctx.Debug(ctx, "stored filled orders in Redis", logger.Strings("orderIds", models.OrderIdsToStrings(ctx, &orders))) return nil } diff --git a/data/redisrepo/store_new_pending_swap.go b/data/redisrepo/store_new_pending_swap.go index 321d41a..b932e3d 100644 --- a/data/redisrepo/store_new_pending_swap.go +++ b/data/redisrepo/store_new_pending_swap.go @@ -39,6 +39,6 @@ func (r *redisRepository) StoreNewPendingSwap(ctx context.Context, p models.Swap return fmt.Errorf("failed to update swap started time: %s", err) } - logctx.Info(ctx, "store pending swap", logger.String("swapId", p.SwapId.String()), logger.String("txHash", p.TxHash)) + logctx.Debug(ctx, "store pending swap", logger.String("swapId", p.SwapId.String()), logger.String("txHash", p.TxHash)) return nil } diff --git a/data/redisrepo/taker.go b/data/redisrepo/taker.go index 4b3ad98..d6f18ed 100644 --- a/data/redisrepo/taker.go +++ b/data/redisrepo/taker.go @@ -62,12 +62,12 @@ func (r *redisRepository) GetSwap(ctx context.Context, swapId uuid.UUID) (*model return nil, models.ErrMarshalError } - logctx.Info(ctx, "got swap", logger.String("swapId", swapId.String())) + logctx.Debug(ctx, "got swap", logger.String("swapId", swapId.String())) return &swap, nil } func (r *redisRepository) RemoveSwap(ctx context.Context, swapId uuid.UUID) error { - logctx.Info(ctx, "RemoveSwap", logger.String("key", swapId.String())) + logctx.Debug(ctx, "RemoveSwap", logger.String("key", swapId.String())) swapKey := CreateOpenSwapKey(swapId) err := r.client.Del(ctx, swapKey).Err() logctx.Error(ctx, "RemoveSwap Redis del failed", logger.String("key", swapKey), logger.Error(err)) diff --git a/data/redisrepo/utils.go b/data/redisrepo/utils.go index 8231b7f..1445850 100644 --- a/data/redisrepo/utils.go +++ b/data/redisrepo/utils.go @@ -81,6 +81,6 @@ func AddVal2Set(ctx context.Context, client redis.Cmdable, key, val string) erro return models.ErrValAlreadyInSet } - logctx.Info(ctx, "Added element to set", logger.String("key", key), logger.String("val", val)) + logctx.Debug(ctx, "Added element to set", logger.String("key", key), logger.String("val", val)) return nil } diff --git a/service/amount_out.go b/service/amount_out.go index 1ef7691..cc17785 100644 --- a/service/amount_out.go +++ b/service/amount_out.go @@ -26,7 +26,7 @@ func (s *Service) GetQuote(ctx context.Context, symbol models.Symbol, side model return models.QuoteRes{}, models.ErrIterFail } if !it.HasNext() { - logctx.Warn(ctx, "GetMinAsk failed") + logctx.Debug(ctx, "insufficient liquidity", logger.String("symbol", symbol.String()), logger.String("side", side.String()), logger.String("inAmount", inAmount.String()), logger.String("minOutAmount", fmt.Sprintf("%v", minOutAmount))) return models.QuoteRes{}, models.ErrInsufficientLiquity } res, err = getOutAmountInAToken(ctx, it, inAmount) @@ -89,8 +89,8 @@ func getOutAmountInAToken(ctx context.Context, it models.OrderIter, inAmountB de outAmountA = outAmountA.Add(gainA) // res - logctx.Info(ctx, fmt.Sprintf("append OrderFrag gainA: %s", gainA.String())) - logctx.Info(ctx, fmt.Sprintf("append OrderFrag spendB: %s", spendB.String())) + logctx.Debug(ctx, fmt.Sprintf("append OrderFrag gainA: %s", gainA.String())) + logctx.Debug(ctx, fmt.Sprintf("append OrderFrag spendB: %s", spendB.String())) frags = append(frags, models.OrderFrag{OrderId: order.Id, OutSize: gainA, InSize: spendB}) } } @@ -99,7 +99,7 @@ func getOutAmountInAToken(ctx context.Context, it models.OrderIter, inAmountB de logctx.Warn(ctx, models.ErrInsufficientLiquity.Error()) return models.QuoteRes{}, models.ErrInsufficientLiquity } - logctx.Info(ctx, fmt.Sprintf("append OrderFrag outAmountA: %s", outAmountA.String())) + logctx.Debug(ctx, fmt.Sprintf("append OrderFrag outAmountA: %s", outAmountA.String())) return models.QuoteRes{Size: outAmountA, OrderFrags: frags}, nil } @@ -130,14 +130,14 @@ func getOutAmountInBToken(ctx context.Context, it models.OrderIter, inAmountA de outAmountB = outAmountB.Add(gainB) // res - logctx.Info(ctx, fmt.Sprintf("append OrderFrag spendA: %s", spendA.String())) - logctx.Info(ctx, fmt.Sprintf("append OrderFrag gainB: %s", gainB.String())) + logctx.Debug(ctx, fmt.Sprintf("append OrderFrag spendA: %s", spendA.String())) + logctx.Debug(ctx, fmt.Sprintf("append OrderFrag gainB: %s", gainB.String())) frags = append(frags, models.OrderFrag{OrderId: order.Id, OutSize: gainB, InSize: spendA}) } if inAmountA.IsPositive() { logctx.Warn(ctx, models.ErrInsufficientLiquity.Error()) return models.QuoteRes{}, models.ErrInsufficientLiquity } - logctx.Info(ctx, fmt.Sprintf("append OrderFrag outAmountB: %s", outAmountB.String())) + logctx.Debug(ctx, fmt.Sprintf("append OrderFrag outAmountB: %s", outAmountB.String())) return models.QuoteRes{Size: outAmountB, OrderFrags: frags}, nil } diff --git a/service/cancel_order.go b/service/cancel_order.go index c9d95c7..35511f6 100644 --- a/service/cancel_order.go +++ b/service/cancel_order.go @@ -107,7 +107,7 @@ func (s *Service) CancelOrder(ctx context.Context, input CancelOrderInput) (*uui func (s *Service) getOrder(ctx context.Context, isClientOId bool, orderId uuid.UUID) (order *models.Order, err error) { if isClientOId { - logctx.Info(ctx, "finding order by clientOId", logger.String("clientOId", orderId.String())) + logctx.Debug(ctx, "finding order by clientOId", logger.String("clientOId", orderId.String())) order, err = s.orderBookStore.FindOrderById(ctx, orderId, true) if err != nil { @@ -115,7 +115,7 @@ func (s *Service) getOrder(ctx context.Context, isClientOId bool, orderId uuid.U return nil, err } } else { - logctx.Info(ctx, "finding order by orderId", logger.String("orderId", orderId.String())) + logctx.Debug(ctx, "finding order by orderId", logger.String("orderId", orderId.String())) order, err = s.orderBookStore.FindOrderById(ctx, orderId, false) if err != nil { logctx.Error(ctx, "could not get order by orderId", logger.Error(err)) diff --git a/service/cancel_orders_for_user.go b/service/cancel_orders_for_user.go index 1a5627d..cf69ec6 100644 --- a/service/cancel_orders_for_user.go +++ b/service/cancel_orders_for_user.go @@ -13,7 +13,7 @@ func (s *Service) CancelOrdersForUser(ctx context.Context, userId uuid.UUID, sym ids, err := s.orderBookStore.GetOpenOrderIds(ctx, userId) if err != nil { - logctx.Info(ctx, "no orders found for user", logger.String("userId", userId.String())) + logctx.Debug(ctx, "no orders found for user", logger.String("userId", userId.String())) return []uuid.UUID{}, err } diff --git a/service/create_order.go b/service/create_order.go index 3ae9e71..f89d87b 100644 --- a/service/create_order.go +++ b/service/create_order.go @@ -34,7 +34,7 @@ func (s *Service) CreateOrder(ctx context.Context, input CreateOrderInput) (mode } if existingOrder == nil { - logctx.Info(ctx, "no existing order with same orderId. Trying to create new order", logger.String("clientOrderId", input.ClientOrderID.String())) + logctx.Debug(ctx, "no existing order with same orderId. Trying to create new order", logger.String("clientOrderId", input.ClientOrderID.String())) return s.createNewOrder(ctx, input, input.UserId) } @@ -56,7 +56,7 @@ func (s *Service) CreateOrder(ctx context.Context, input CreateOrderInput) (mode func (s *Service) createNewOrder(ctx context.Context, input CreateOrderInput, userId uuid.UUID) (models.Order, error) { orderId := uuid.New() - logctx.Info(ctx, "creating new order", logger.String("orderId", orderId.String()), logger.String("clientOrderId", input.ClientOrderID.String())) + logctx.Debug(ctx, "creating new order", logger.String("orderId", orderId.String()), logger.String("clientOrderId", input.ClientOrderID.String())) order := models.Order{ Id: orderId, diff --git a/service/evm_check_pending_txs.go b/service/evm_check_pending_txs.go index f2c8335..b8db69d 100644 --- a/service/evm_check_pending_txs.go +++ b/service/evm_check_pending_txs.go @@ -37,17 +37,17 @@ func (e *EvmClient) CheckPendingTxs(ctx context.Context) error { } if len(pendingSwaps) == 0 { - logctx.Info(ctx, "No pending swaps. Sleeping...") + logctx.Debug(ctx, "No pending swaps. Sleeping...") return nil } - logctx.Info(ctx, "Found pending swaps to process", logger.Int("numPending", len(pendingSwaps))) + logctx.Debug(ctx, "Found pending swaps to process", logger.Int("numPending", len(pendingSwaps))) var wg sync.WaitGroup var mu sync.Mutex for i := 0; i < len(pendingSwaps); i++ { - logctx.Info(ctx, "Trying to process pending swap", logger.Int("index", i), logger.String("txHash", pendingSwaps[i].TxHash), logger.String("swapId", pendingSwaps[i].Id.String())) + logctx.Debug(ctx, "Trying to process pending swap", logger.Int("index", i), logger.String("txHash", pendingSwaps[i].TxHash), logger.String("swapId", pendingSwaps[i].Id.String())) wg.Add(1) go func(index int) { @@ -72,21 +72,21 @@ func (e *EvmClient) CheckPendingTxs(ctx context.Context) error { switch tx.Status { case models.TX_SUCCESS: - logctx.Info(ctx, "Transaction successful", logger.String("txHash", p.TxHash), logger.String("swapId", p.Id.String())) + logctx.Debug(ctx, "Transaction successful", logger.String("txHash", p.TxHash), logger.String("swapId", p.Id.String())) _, err = e.ResolveSwap(ctx, p, true, &mu) if err != nil { logctx.Error(ctx, "Failed to process successful transaction", logger.Error(err), logger.String("txHash", p.TxHash), logger.String("swapId", p.Id.String())) return } case models.TX_FAILURE: - logctx.Info(ctx, "Transaction failed", logger.String("txHash", p.TxHash), logger.String("swapId", p.Id.String())) + logctx.Debug(ctx, "Transaction failed", logger.String("txHash", p.TxHash), logger.String("swapId", p.Id.String())) _, err = e.ResolveSwap(ctx, p, false, &mu) if err != nil { logctx.Error(ctx, "Failed to process failed transaction", logger.Error(err), logger.String("txHash", p.TxHash), logger.String("swapId", p.Id.String())) return } case models.TX_PENDING: - logctx.Info(ctx, "Transaction still pending", logger.String("txHash", p.TxHash), logger.String("swapId", p.Id.String())) + logctx.Debug(ctx, "Transaction still pending", logger.String("txHash", p.TxHash), logger.String("swapId", p.Id.String())) default: logctx.Error(ctx, "Unknown transaction status", logger.String("txHash", p.TxHash), logger.String("swapId", p.Id.String())) return @@ -97,6 +97,6 @@ func (e *EvmClient) CheckPendingTxs(ctx context.Context) error { wg.Wait() - logctx.Info(ctx, "Finished checking pending swaps", logger.Int("numPending", len(pendingSwaps))) + logctx.Debug(ctx, "Finished checking pending swaps", logger.Int("numPending", len(pendingSwaps))) return nil } diff --git a/service/evm_check_pending_txs_utils.go b/service/evm_check_pending_txs_utils.go index bed4816..b144906 100644 --- a/service/evm_check_pending_txs_utils.go +++ b/service/evm_check_pending_txs_utils.go @@ -113,6 +113,6 @@ func (e *EvmClient) ResolveSwap(ctx context.Context, swap models.Swap, isSuccess logctx.Error(ctx, "Error StoreOpenOrders", logger.Error(err), logger.String("swapId", swap.Id.String())) } - logctx.Info(ctx, "Resolved swap", logger.String("swapId", swap.Id.String()), logger.Bool("isSuccessful", isSuccessful), logger.String("created", swap.Created.String()), logger.String("resolved", swap.Resolved.String()), logger.String("txHash", swap.TxHash)) + logctx.Debug(ctx, "Resolved swap", logger.String("swapId", swap.Id.String()), logger.Bool("isSuccessful", isSuccessful), logger.String("created", swap.Created.String()), logger.String("resolved", swap.Resolved.String()), logger.String("txHash", swap.TxHash)) return orders, nil } diff --git a/service/evm_verify_signature.go b/service/evm_verify_signature.go index 2ee2b5c..0802384 100644 --- a/service/evm_verify_signature.go +++ b/service/evm_verify_signature.go @@ -165,7 +165,7 @@ func (e *EvmClient) VerifySignature(ctx context.Context, input VerifySignatureIn return false, fmt.Errorf("signature does not match") } - logctx.Info(ctx, "signature is valid", logger.String("recoveredPub", hex.EncodeToString(recoveredPubBytes)), logger.String("originalPub", hex.EncodeToString(originalPubBytes))) + logctx.Debug(ctx, "signature is valid", logger.String("recoveredPub", hex.EncodeToString(recoveredPubBytes)), logger.String("originalPub", hex.EncodeToString(originalPubBytes))) // Signature is valid return true, nil } diff --git a/service/get_market_depth.go b/service/get_market_depth.go index 49c377d..03e0fbd 100644 --- a/service/get_market_depth.go +++ b/service/get_market_depth.go @@ -16,6 +16,6 @@ func (s *Service) GetMarketDepth(ctx context.Context, symbol models.Symbol, dept return models.MarketDepth{}, err } - logctx.Info(ctx, "got market depth", logger.String("symbol", symbol.String())) + logctx.Debug(ctx, "got market depth", logger.String("symbol", symbol.String())) return marketDepth, nil } diff --git a/service/get_order_by_client_oid.go b/service/get_order_by_client_oid.go index 03e1e84..ed4bf60 100644 --- a/service/get_order_by_client_oid.go +++ b/service/get_order_by_client_oid.go @@ -13,7 +13,7 @@ func (s *Service) GetOrderByClientOId(ctx context.Context, clientOId uuid.UUID) order, err := s.orderBookStore.FindOrderById(ctx, clientOId, true) if err == models.ErrNotFound { - logctx.Info(ctx, "order not found", logger.String("clientOId", clientOId.String())) + logctx.Debug(ctx, "order not found", logger.String("clientOId", clientOId.String())) return nil, nil } @@ -22,6 +22,6 @@ func (s *Service) GetOrderByClientOId(ctx context.Context, clientOId uuid.UUID) return nil, err } - logctx.Info(ctx, "order found for orderId", logger.String("clientOId", clientOId.String())) + logctx.Debug(ctx, "order found for orderId", logger.String("clientOId", clientOId.String())) return order, nil } diff --git a/service/get_order_by_id.go b/service/get_order_by_id.go index ce10fe3..02f550b 100644 --- a/service/get_order_by_id.go +++ b/service/get_order_by_id.go @@ -13,7 +13,7 @@ func (s *Service) GetOrderById(ctx context.Context, orderId uuid.UUID) (*models. order, err := s.orderBookStore.FindOrderById(ctx, orderId, false) if err == models.ErrNotFound { - logctx.Info(ctx, "order not found", logger.String("orderId", orderId.String())) + logctx.Debug(ctx, "order not found", logger.String("orderId", orderId.String())) return nil, nil } @@ -22,6 +22,6 @@ func (s *Service) GetOrderById(ctx context.Context, orderId uuid.UUID) (*models. return nil, err } - logctx.Info(ctx, "order found for orderId", logger.String("orderId", orderId.String())) + logctx.Debug(ctx, "order found for orderId", logger.String("orderId", orderId.String())) return order, nil } diff --git a/service/get_orders_for_user.go b/service/get_orders_for_user.go index 79d175e..f4f2084 100644 --- a/service/get_orders_for_user.go +++ b/service/get_orders_for_user.go @@ -11,7 +11,7 @@ import ( ) func (s *Service) GetOpenOrdersForUser(ctx context.Context, userId uuid.UUID) (orders []models.Order, totalOrders int, err error) { - logctx.Info(ctx, "getting open orders for user", logger.String("user_id", userId.String())) + logctx.Debug(ctx, "getting open orders for user", logger.String("user_id", userId.String())) orders, totalOrders, err = s.orderBookStore.GetOrdersForUser(ctx, userId, false) if err != nil { @@ -19,13 +19,13 @@ func (s *Service) GetOpenOrdersForUser(ctx context.Context, userId uuid.UUID) (o return nil, 0, fmt.Errorf("error getting open orders for user: %w", err) } - logctx.Info(ctx, "returning open orders for user", logger.String("user_id", userId.String()), logger.Int("orders_count", len(orders))) + logctx.Debug(ctx, "returning open orders for user", logger.String("user_id", userId.String()), logger.Int("orders_count", len(orders))) return orders, totalOrders, nil } func (s *Service) GetFilledOrdersForUser(ctx context.Context, userId uuid.UUID) (orders []models.Order, totalOrders int, err error) { - logctx.Info(ctx, "getting filled orders for user", logger.String("user_id", userId.String())) + logctx.Debug(ctx, "getting filled orders for user", logger.String("user_id", userId.String())) orders, totalOrders, err = s.orderBookStore.GetOrdersForUser(ctx, userId, true) if err != nil { @@ -33,7 +33,7 @@ func (s *Service) GetFilledOrdersForUser(ctx context.Context, userId uuid.UUID) return nil, 0, fmt.Errorf("error getting filled orders for user: %w", err) } - logctx.Info(ctx, "returning filled orders for user", logger.String("user_id", userId.String()), logger.Int("orders_count", len(orders))) + logctx.Debug(ctx, "returning filled orders for user", logger.String("user_id", userId.String()), logger.Int("orders_count", len(orders))) return orders, totalOrders, nil } diff --git a/service/periodic.go b/service/periodic.go index e43745b..57ffff9 100644 --- a/service/periodic.go +++ b/service/periodic.go @@ -15,7 +15,7 @@ func (s *Service) startPeriodicChecks() { secSwapStarted := restutils.GetEnv("SEC_PERIODIC_INTERVAL", "10") sec, _ := strconv.Atoi(secSwapStarted) ctx := context.Background() - logctx.Info(ctx, "startPeriodicChecks", logger.Int("sec_interval", sec)) + logctx.Debug(ctx, "startPeriodicChecks", logger.Int("sec_interval", sec)) go func() { interval := time.Tick(time.Second * time.Duration(sec)) for range interval { @@ -29,7 +29,7 @@ func (s *Service) periodicCheck(ctx context.Context) { sec, _ := strconv.Atoi(secSwapStarted) if sec > 0 { // USE ZERO as Turn Off feature flag - logctx.Info(ctx, "SEC_SWAP_STARTED", logger.Int("sec_interval", sec)) + logctx.Debug(ctx, "SEC_SWAP_STARTED", logger.Int("sec_interval", sec)) err := s.checkNonStartedSwaps(ctx, int64(sec)) if err != nil { logctx.Error(ctx, "Error in peridic checks", logger.Error(err)) @@ -63,14 +63,14 @@ func (s *Service) checkSwapStarted(ctx context.Context, swap models.Swap, secPer // no need to abort return } - logctx.Info(ctx, "swap was not started after allowed period", logger.String("swapId", swap.Id.String())) + logctx.Debug(ctx, "swap was not started after allowed period", logger.String("swapId", swap.Id.String())) err = s.AbortSwap(ctx, swap.Id) if err != nil { logctx.Error(ctx, "failed to AutoabortSwap", logger.String("created", swap.Created.String()), logger.Error(err)) return } // SUCCESS - logctx.Info(ctx, "Auto abortSwap after interval", logger.String("swapId", swap.Id.String()), logger.Int("secPerios", int(secPeriod))) + logctx.Debug(ctx, "Auto abortSwap after interval", logger.String("swapId", swap.Id.String()), logger.Int("secPerios", int(secPeriod))) } func (s *Service) checkNonStartedSwaps(ctx context.Context, secPeriod int64) error { diff --git a/service/reporter.go b/service/reporter.go index d04c914..edf4d8c 100644 --- a/service/reporter.go +++ b/service/reporter.go @@ -28,7 +28,7 @@ func NewReporter(svc *Service) *Reporter { num = 10 } ctx := context.Background() - logctx.Info(ctx, "NewReporter()", logger.String("SecInterval", strSec)) + logctx.Debug(ctx, "NewReporter()", logger.String("SecInterval", strSec)) return &Reporter{svc: svc, stop: make(chan struct{}), ctx: ctx, secInterval: num} } @@ -38,7 +38,7 @@ func (r *Reporter) logRoutine() { for { select { case <-r.stop: - logctx.Info(r.ctx, "Reporter routine stopped.") + logctx.Debug(r.ctx, "Reporter routine stopped.") return case <-time.After(time.Duration(r.secInterval) * time.Second): r.tick() @@ -47,18 +47,18 @@ func (r *Reporter) logRoutine() { } func (r *Reporter) Start() { - logctx.Info(r.ctx, "Reporter logging routine.") + logctx.Debug(r.ctx, "Reporter logging routine.") go r.logRoutine() } func (r *Reporter) Stop() { - logctx.Info(r.ctx, "Reporter logging routine.") + logctx.Debug(r.ctx, "Reporter logging routine.") close(r.stop) } func (r *Reporter) sumOrderSide(isAsk bool, it models.OrderIter) error { if !it.HasNext() { - logctx.Warn(r.ctx, "GetMinAsk failed") + logctx.Debug(r.ctx, "no orders in iterator") } topOrder := float64(0) sumSize := float64(0) diff --git a/service/taker.go b/service/taker.go index e437e47..dfa9a67 100644 --- a/service/taker.go +++ b/service/taker.go @@ -101,7 +101,7 @@ func (s *Service) SwapStarted(ctx context.Context, swapId uuid.UUID, txHash stri } func (s *Service) AbortSwap(ctx context.Context, swapId uuid.UUID) error { - logctx.Info(ctx, "AbortSwap", logger.String("swapId", swapId.String())) + logctx.Debug(ctx, "AbortSwap", logger.String("swapId", swapId.String())) // get swap from store swap, err := s.orderBookStore.GetSwap(ctx, swapId) if err != nil { @@ -165,7 +165,7 @@ func (s *Service) cancelUnlockedOrders(ctx context.Context, orders []models.Orde return err } - logctx.Info(ctx, "unfilled order removed", logger.String("orderId", order.Id.String()), logger.String("userId", order.UserId.String()), logger.String("size", order.Size.String()), logger.String("sizeFilled", order.SizeFilled.String()), logger.String("sizePending", order.SizePending.String())) + logctx.Debug(ctx, "unfilled order removed", logger.String("orderId", order.Id.String()), logger.String("userId", order.UserId.String()), logger.String("size", order.Size.String()), logger.String("sizeFilled", order.SizeFilled.String()), logger.String("sizePending", order.SizePending.String())) } else { err := s.orderBookStore.CancelPartialFilledOrder(ctx, order) @@ -174,7 +174,7 @@ func (s *Service) cancelUnlockedOrders(ctx context.Context, orders []models.Orde return err } - logctx.Info(ctx, "partial filled order cancelled", logger.String("orderId", order.Id.String()), logger.String("userId", order.UserId.String()), logger.String("size", order.Size.String()), logger.String("sizeFilled", order.SizeFilled.String()), logger.String("sizePending", order.SizePending.String())) + logctx.Debug(ctx, "partial filled order cancelled", logger.String("orderId", order.Id.String()), logger.String("userId", order.UserId.String()), logger.String("size", order.Size.String()), logger.String("sizeFilled", order.SizeFilled.String()), logger.String("sizePending", order.SizePending.String())) } } diff --git a/transport/middleware/pagination.go b/transport/middleware/pagination.go index 5070f46..2f2a772 100644 --- a/transport/middleware/pagination.go +++ b/transport/middleware/pagination.go @@ -53,7 +53,7 @@ func PaginationMiddleware(next http.HandlerFunc) http.HandlerFunc { ctx := utils.WithPaginationCtx(r.Context(), &utils.Paginator{Page: page, PageSize: pageSize}) - logctx.Info(ctx, "pagination middleware", logger.String("url", r.URL.Path), logger.Int("page", page), logger.Int("pageSize", pageSize)) + logctx.Debug(ctx, "pagination middleware", logger.String("url", r.URL.Path), logger.Int("page", page), logger.Int("pageSize", pageSize)) next.ServeHTTP(w, r.WithContext(ctx)) }) diff --git a/transport/rest/cancel_order.go b/transport/rest/cancel_order.go index e32a193..86aa685 100644 --- a/transport/rest/cancel_order.go +++ b/transport/rest/cancel_order.go @@ -37,7 +37,7 @@ func (h *Handler) CancelOrderByOrderId(w http.ResponseWriter, r *http.Request) { return } - logctx.Info(ctx, "user trying to cancel order by orderID", logger.String("userId", user.Id.String()), logger.String("orderId", orderId.String())) + logctx.Debug(ctx, "user trying to cancel order by orderID", logger.String("userId", user.Id.String()), logger.String("orderId", orderId.String())) h.handleCancelOrder(hInput{ ctx: ctx, @@ -66,7 +66,7 @@ func (h *Handler) CancelOrderByClientOId(w http.ResponseWriter, r *http.Request) return } - logctx.Info(ctx, "user trying to cancel order by clientOId", logger.String("userId", user.Id.String()), logger.String("clientOId", clientOId.String())) + logctx.Debug(ctx, "user trying to cancel order by clientOId", logger.String("userId", user.Id.String()), logger.String("clientOId", clientOId.String())) h.handleCancelOrder(hInput{ ctx: ctx, diff --git a/transport/rest/cancel_orders_for_user.go b/transport/rest/cancel_orders_for_user.go index 9efe601..31fc523 100644 --- a/transport/rest/cancel_orders_for_user.go +++ b/transport/rest/cancel_orders_for_user.go @@ -31,14 +31,14 @@ func (h *Handler) CancelOrdersForUser(w http.ResponseWriter, r *http.Request) { symbol := r.URL.Query().Get("symbol") symbol = strings.ToUpper(symbol) if symbol == "" { - logctx.Warn(ctx, "cancelAll symbol was not provided, cancelling all orders in all symbols", logger.String("userId", user.Id.String())) + logctx.Debug(ctx, "cancelAll symbol was not provided, cancelling all orders in all symbols", logger.String("userId", user.Id.String())) } - logctx.Info(ctx, "user trying to cancel all their orders", logger.String("symbol", symbol), logger.String("userId", user.Id.String())) + logctx.Debug(ctx, "user trying to cancel all their orders", logger.String("symbol", symbol), logger.String("userId", user.Id.String())) orderIds, err := h.svc.CancelOrdersForUser(ctx, user.Id, models.Symbol(symbol)) if err == models.ErrNotFound { - logctx.Info(ctx, "no orders found for user", logger.String("userId", user.Id.String())) + logctx.Debug(ctx, "no orders found for user", logger.String("userId", user.Id.String())) restutils.WriteJSONError(ctx, w, http.StatusNotFound, "No orders found") return } @@ -49,7 +49,7 @@ func (h *Handler) CancelOrdersForUser(w http.ResponseWriter, r *http.Request) { return } - logctx.Info(ctx, "cancelled all orders for user", logger.String("userId", user.Id.String()), logger.Int("numOrders", len(orderIds))) + logctx.Debug(ctx, "cancelled all orders for user", logger.String("userId", user.Id.String()), logger.Int("numOrders", len(orderIds))) res := CancelOrdersForUserResponse{ Symbol: symbol, diff --git a/transport/rest/create_order.go b/transport/rest/create_order.go index 574bedb..e43169a 100644 --- a/transport/rest/create_order.go +++ b/transport/rest/create_order.go @@ -139,7 +139,7 @@ func (h *Handler) CreateOrder(w http.ResponseWriter, r *http.Request) { restutils.WriteJSONError(ctx, w, http.StatusInternalServerError, "Error creating order. Try again later") } - logctx.Info(ctx, "order created", logger.String("userId", user.Id.String()), logger.String("orderId", order.Id.String()), logger.String("price", parsedFields.roundedDecPrice.String()), logger.String("size", parsedFields.decSize.String()), logger.String("side", parsedFields.side.String())) + logctx.Debug(ctx, "order created", logger.String("userId", user.Id.String()), logger.String("orderId", order.Id.String()), logger.String("price", parsedFields.roundedDecPrice.String()), logger.String("size", parsedFields.decSize.String()), logger.String("side", parsedFields.side.String())) } type hVRFArgs struct { diff --git a/transport/rest/create_orders.go b/transport/rest/create_orders.go index cf6a7be..fe2640f 100644 --- a/transport/rest/create_orders.go +++ b/transport/rest/create_orders.go @@ -150,7 +150,7 @@ func (h *Handler) CreateOrders(w http.ResponseWriter, r *http.Request) { break } - logctx.Info(ctx, "user created order", logger.String("userId", user.Id.String()), logger.String("price", parsedFields.roundedDecPrice.String()), logger.String("size", parsedFields.decSize.String()), logger.String("clientOrderId", parsedFields.clientOrderId.String())) + logctx.Debug(ctx, "user created order", logger.String("userId", user.Id.String()), logger.String("price", parsedFields.roundedDecPrice.String()), logger.String("size", parsedFields.decSize.String()), logger.String("clientOrderId", parsedFields.clientOrderId.String())) createdOrders = append(createdOrders, order) } @@ -163,7 +163,7 @@ func (h *Handler) CreateOrders(w http.ResponseWriter, r *http.Request) { return } - logctx.Info(ctx, "user created orders", logger.String("userId", user.Id.String()), logger.Int("numOfOrders", len(createdOrders))) + logctx.Debug(ctx, "user created orders", logger.String("userId", user.Id.String()), logger.Int("numOfOrders", len(createdOrders))) response.Status = http.StatusCreated restutils.WriteJSONResponse(ctx, w, http.StatusCreated, response, logger.String("userId", user.Id.String())) diff --git a/transport/rest/get_market_depth.go b/transport/rest/get_market_depth.go index 196827f..100dee5 100644 --- a/transport/rest/get_market_depth.go +++ b/transport/rest/get_market_depth.go @@ -60,7 +60,7 @@ func (h *Handler) GetMarketDepth(w http.ResponseWriter, r *http.Request) { return } - logctx.Info(r.Context(), "user trying to get market depth", logger.String("userId", user.Id.String()), logger.String("symbol", symbol.String()), logger.Int("limit", limit)) + logctx.Debug(r.Context(), "user trying to get market depth", logger.String("userId", user.Id.String()), logger.String("symbol", symbol.String()), logger.Int("limit", limit)) marketDepth, err := h.svc.GetMarketDepth(r.Context(), symbol, limit) if err != nil { diff --git a/transport/rest/get_order_by_client_oid.go b/transport/rest/get_order_by_client_oid.go index 6b33c65..e61bb92 100644 --- a/transport/rest/get_order_by_client_oid.go +++ b/transport/rest/get_order_by_client_oid.go @@ -21,7 +21,7 @@ func (h *Handler) GetOrderByClientOId(w http.ResponseWriter, r *http.Request) { return } - logctx.Info(r.Context(), "user trying to get order by clientOId", logger.String("clientOId", clientOId.String())) + logctx.Debug(r.Context(), "user trying to get order by clientOId", logger.String("clientOId", clientOId.String())) order, err := h.svc.GetOrderByClientOId(r.Context(), clientOId) if err != nil { diff --git a/transport/rest/get_order_by_id.go b/transport/rest/get_order_by_id.go index b31ac51..38500b0 100644 --- a/transport/rest/get_order_by_id.go +++ b/transport/rest/get_order_by_id.go @@ -31,7 +31,7 @@ func (h *Handler) GetOrderById(w http.ResponseWriter, r *http.Request) { return } - logctx.Info(r.Context(), "user trying to get order by ID", logger.String("userId", user.Id.String()), logger.String("orderId", orderId.String())) + logctx.Debug(r.Context(), "user trying to get order by ID", logger.String("userId", user.Id.String()), logger.String("orderId", orderId.String())) order, err := h.svc.GetOrderById(r.Context(), orderId) if err != nil { diff --git a/transport/rest/get_orders_for_user.go b/transport/rest/get_orders_for_user.go index 3dbc212..e560db1 100644 --- a/transport/rest/get_orders_for_user.go +++ b/transport/rest/get_orders_for_user.go @@ -21,7 +21,7 @@ func (h *Handler) GetOpenOrdersForUser(w http.ResponseWriter, r *http.Request) { return } - logctx.Info(r.Context(), "user trying to get their open orders", logger.String("userId", user.Id.String())) + logctx.Debug(r.Context(), "user trying to get their open orders", logger.String("userId", user.Id.String())) orders, totalOrders, err := h.svc.GetOpenOrdersForUser(r.Context(), user.Id) @@ -58,7 +58,7 @@ func (h *Handler) GetFilledOrdersForUser(w http.ResponseWriter, r *http.Request) return } - logctx.Info(r.Context(), "user trying to get their filled orders", logger.String("userId", user.Id.String())) + logctx.Debug(r.Context(), "user trying to get their filled orders", logger.String("userId", user.Id.String())) orders, totalOrders, err := h.svc.GetFilledOrdersForUser(r.Context(), user.Id) diff --git a/transport/rest/taker.go b/transport/rest/taker.go index 0b0cfd3..7c06091 100644 --- a/transport/rest/taker.go +++ b/transport/rest/taker.go @@ -129,7 +129,7 @@ func (h *Handler) handleQuote(w http.ResponseWriter, r *http.Request, isSwap boo return nil } - logctx.Info(ctx, "QuoteReq", logger.String("InToken", req.InToken), logger.String("InAmount", req.InAmount), logger.String("OutToken", req.OutToken), logger.String("MinOutAmount", req.MinOutAmount)) + logctx.Debug(ctx, "QuoteReq", logger.String("InToken", req.InToken), logger.String("InAmount", req.InAmount), logger.String("OutToken", req.OutToken), logger.String("MinOutAmount", req.MinOutAmount)) // ensure token names if only addresses were sent err = h.resolveQuoteTokenNames(&req) @@ -186,12 +186,12 @@ func (h *Handler) handleQuote(w http.ResponseWriter, r *http.Request, isSwap boo Fragments: []Fragment{}, } - logctx.Info(ctx, "QuoteRes", logger.String("OutAmount", res.OutAmount)) + logctx.Debug(ctx, "QuoteRes", logger.String("OutAmount", res.OutAmount)) if isSwap { swapData, err := h.svc.BeginSwap(r.Context(), svcQuoteRes) res.SwapId = swapData.SwapId.String() - logctx.Info(ctx, "BeginSwap", logger.String("swapId", res.SwapId)) + logctx.Debug(ctx, "BeginSwap", logger.String("swapId", res.SwapId)) if err != nil { restutils.WriteJSONError(ctx, w, http.StatusInternalServerError, err.Error()) return nil @@ -236,7 +236,7 @@ func (h *Handler) handleQuote(w http.ResponseWriter, r *http.Request, isSwap boo } signedOrders = append(signedOrders, signedOrder) // MakerInAmount == takerOutAmount - logctx.Info(ctx, "append swap fragment", logger.String("swapId", res.SwapId), logger.Int("fragIndex", i), logger.String("TakerInAmount", frag.TakerInAmount), logger.String("MakerInAmount", takerOutAmount)) + logctx.Debug(ctx, "append swap fragment", logger.String("swapId", res.SwapId), logger.Int("fragIndex", i), logger.String("TakerInAmount", frag.TakerInAmount), logger.String("MakerInAmount", takerOutAmount)) } // abi encode abiCall, err := abi.PackSignedOrders(ctx, signedOrders)