Hotfix/log err (#234)

* remive curl

* ignore curl.sh

* add log params to all logs

* fix log param order

* add symbol to log events quote beginSwap and swapStarted

* add model and side to swap events, return swap object for logs

* fix test, decap swapStarted event

* fix beginSwap to have symbol

* fix field glitch in error fields

* report becomes a debug log

* sys msg in api err

service/amount_out.go

@@ -51,7 +51,7 @@ func (s *Service) GetQuote(ctx context.Context, symbol models.Symbol, makerSide
 		res, err = getOutAmountInBToken(ctx, it, inAmount, walletVerifier)
 	}
 	if err != nil {
-		logctx.Error(ctx, "getQuoteResIn failed", logger.Error(err))
+		logctx.Warn(ctx, "getQuoteResIn failed", logger.Error(err))
 		return models.QuoteRes{}, err
 	}
 

service/reporter.go

@@ -128,6 +128,6 @@ func (r *Reporter) tick() {
 			logctx.Error(r.ctx, "sumOrderSide failed", logger.Error(err))
 		}
 		// report
-		logctx.Info(r.ctx, "report", r.fields...)
+		logctx.Debug(r.ctx, "report", r.fields...)
 	}
 }

transport/rest/taker.go

@@ -144,6 +144,9 @@ func (h *Handler) handleQuote(w http.ResponseWriter, r *http.Request, isSwap boo
 
 	// ensure token names if only addresses were sent
 	err = h.resolveQuoteTokenNames(&req)
+	// refresh log fields now that name been resolved
+	logFields = []logger.Field{logger.Bool("isSwap", isSwap), logger.String("InToken", req.InToken), logger.String("InTokenAddress", req.InTokenAddress), logger.String("InAmount", req.InAmount), logger.String("OutToken", req.OutToken), logger.String("OutTokenAddress", req.OutTokenAddress), logger.String("MinOutAmount", req.MinOutAmount)}
+
 	if err != nil {
 		logctx.Warn(ctx, "handleQuote Failed to resolveQuoteTokenNames", append(logFields, logger.Error(err))...)
 		restutils.WriteJSONError(ctx, w, http.StatusBadRequest, err.Error(), logger.String("InTokenAddress", req.InTokenAddress), logger.String("OutTokenAddress", req.OutTokenAddress))
@@ -172,7 +175,8 @@ func (h *Handler) handleQuote(w http.ResponseWriter, r *http.Request, isSwap boo
 	pair := h.pairMngr.Resolve(req.InToken, req.OutToken)
 
 	if pair == nil {
-		restutils.WriteJSONError(ctx, w, http.StatusBadRequest, "no suppoerted pair was found for tokens", logger.String("InToken", req.InToken), logger.String("OutToken", req.OutToken))
+		logctx.Warn(ctx, "'Quote::minOutAmount' is not a valid number format - passing nil", logFields...)
+		restutils.WriteJSONError(ctx, w, http.StatusBadRequest, "no suppoerted pair was found for tokens", logFields...)
 		return nil
 	}
 	// taker's in token to maker's side
@@ -188,11 +192,11 @@ func (h *Handler) handleQuote(w http.ResponseWriter, r *http.Request, isSwap boo
 	svcQuoteRes, err := h.svc.GetQuote(r.Context(), pair.Symbol(), makerSide, inAmount, minOutAmount, makerInAdrs)
 	if err != nil {
 		if err == models.ErrMinOutAmount {
-			restutils.WriteJSONError(ctx, w, http.StatusBadRequest, err.Error())
+			restutils.WriteJSONError(ctx, w, http.StatusBadRequest, err.Error(), logFields...)
 		} else if err == models.ErrInsufficientBalance {
-			restutils.WriteJSONError(ctx, w, http.StatusConflict, err.Error())
+			restutils.WriteJSONError(ctx, w, http.StatusConflict, err.Error(), logFields...)
 		} else {
-			restutils.WriteJSONError(ctx, w, http.StatusInternalServerError, err.Error())
+			restutils.WriteJSONError(ctx, w, http.StatusInternalServerError, err.Error(), logFields...)
 		}
 		return nil
 	}

transport/restutils/utils.go

@@ -49,10 +49,12 @@ func WriteJSONError(ctx context.Context, w http.ResponseWriter, status int, mess
 	if err := json.NewEncoder(w).Encode(errResponse); err != nil {
 		logFields = append(logFields, logger.Error(err))
 		logctx.Error(ctx, "failed to write error response", logFields...)
+		return
 	}
 
 	// log details about why the request failed or was rejected
-	logFields = append(logFields, logger.String("status", http.StatusText(status)), logger.String("message", message))
+	logFields = append(logFields, logger.String("sys_msg", message))
+	logFields = append(logFields, logger.String("status", http.StatusText(status)))
 	logctx.Warn(ctx, "api request not successful", logFields...)
 }