Skip to content

A
ai-api-mgr
Commit e2a56d1a authored by Cloud User's avatar Cloud User
Browse files
Options

fix log

parent 9e661054
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 23 deletions
main.go
View file @ e2a56d1a
...@@ -946,8 +946,6 @@ func main() { ...@@ -946,8 +946,6 @@ func main() {
} else { } else {
return ApiErrorF(c, fmt.Sprintf("Please provide http header %s .", RequestId), attributes) return ApiErrorF(c, fmt.Sprintf("Please provide http header %s .", RequestId), attributes)
//return c.SendString(fmt.Sprintf("Please provide http header %s .", RequestId))
} }
slogfiber.AddCustomAttributes(c, slog.String(RequestId, reqHeaders[RequestId][0])) slogfiber.AddCustomAttributes(c, slog.String(RequestId, reqHeaders[RequestId][0]))
...@@ -961,7 +959,6 @@ func main() { ...@@ -961,7 +959,6 @@ func main() {
if len(taskId) == 0 { if len(taskId) == 0 {
return ApiErrorF(c, fmt.Sprintf("%s must provide task id param for route %s ; e.g. http://127.0.0.1/query/v1/e45b5ebc-c71e-4ab8-b10f-d1202e7fb16e ", c.Path(), c.Route().Path), attributes) return ApiErrorF(c, fmt.Sprintf("%s must provide task id param for route %s ; e.g. http://127.0.0.1/query/v1/e45b5ebc-c71e-4ab8-b10f-d1202e7fb16e ", c.Path(), c.Route().Path), attributes)
//return c.SendString(fmt.Sprintf("%s must provide task id param for route %s ; e.g. http://127.0.0.1/query/v1/e45b5ebc-c71e-4ab8-b10f-d1202e7fb16e ", c.Path(), c.Route().Path))
} }
if res, ok := getAsyncRes(taskId); ok { if res, ok := getAsyncRes(taskId); ok {
...@@ -987,7 +984,6 @@ func main() { ...@@ -987,7 +984,6 @@ func main() {
return ApiErrorF(c, fmt.Sprintf("can not find out the task id %s in result cache.", taskId), attributes) return ApiErrorF(c, fmt.Sprintf("can not find out the task id %s in result cache.", taskId), attributes)
//return c.SendString(fmt.Sprintf("can not find out the task id %s in result cache.", taskId))
}) })
cfg := slogfiber.Config{ cfg := slogfiber.Config{
...@@ -1017,7 +1013,6 @@ func main() { ...@@ -1017,7 +1013,6 @@ func main() {
if err := gogoPbProto.Unmarshal(body, &resbody); err != nil { if err := gogoPbProto.Unmarshal(body, &resbody); err != nil {
return ApiErrorF(c, fmt.Sprintf("callback Unmarshal error %v", err.Error()), attributes) return ApiErrorF(c, fmt.Sprintf("callback Unmarshal error %v", err.Error()), attributes)
//return c.SendString(fmt.Sprintf("callback Unmarshal error %v", err.Error()))
} }
slogfiber.AddCustomAttributes(c, slog.String(TaskIdAtrr, resbody.TaskId)) slogfiber.AddCustomAttributes(c, slog.String(TaskIdAtrr, resbody.TaskId))
...@@ -1070,12 +1065,16 @@ func ApiOrJWT(c *fiber.Ctx) error { ...@@ -1070,12 +1065,16 @@ func ApiOrJWT(c *fiber.Ctx) error {
if taskHeaders, ok := reqHeaders[TaskIdAtrr]; ok { if taskHeaders, ok := reqHeaders[TaskIdAtrr]; ok {
if taskHeaders == nil || len(taskHeaders) == 0 { if taskHeaders == nil || len(taskHeaders) == 0 {
return ApiErrorF(c, fmt.Sprintf(fmt.Sprintf("Please provide http header %s value, right now the value is %v.", TaskIdAtrr, taskHeaders)), nil)
//return c.SendString(fmt.Sprintf("Please provide http header %s value, right now the value is %v.", TaskIdAtrr, taskHeaders)) baseAttributes := []slog.Attr{}
baseAttributes = append(baseAttributes, slog.String(TaskIdAtrr, "can not get "+TaskIdAtrr))
return ApiErrorF(c, fmt.Sprintf(fmt.Sprintf("Please provide http header %s value, right now the value is %v.", TaskIdAtrr, taskHeaders)), baseAttributes)
} }
} else { } else {
return ApiErrorF(c, fmt.Sprintf("Please provide http header %s .", TaskIdAtrr), nil) baseAttributes := []slog.Attr{}
//return c.SendString(fmt.Sprintf("Please provide http header %s .", TaskIdAtrr)) baseAttributes = append(baseAttributes, slog.String(TaskIdAtrr, "can not get "+TaskIdAtrr))
return ApiErrorF(c, fmt.Sprintf("Please provide http header %s .", TaskIdAtrr), baseAttributes)
} }
baseAttributes := []slog.Attr{} baseAttributes := []slog.Attr{}
...@@ -1085,11 +1084,9 @@ func ApiOrJWT(c *fiber.Ctx) error { ...@@ -1085,11 +1084,9 @@ func ApiOrJWT(c *fiber.Ctx) error {
if RequestIdHeaders, ok := reqHeaders[RequestId]; ok { if RequestIdHeaders, ok := reqHeaders[RequestId]; ok {
if RequestIdHeaders == nil || len(RequestIdHeaders) == 0 { if RequestIdHeaders == nil || len(RequestIdHeaders) == 0 {
return ApiErrorF(c, fmt.Sprintf("Please provide http header %s value, right now the value is %v.", RequestId, RequestIdHeaders), nil) return ApiErrorF(c, fmt.Sprintf("Please provide http header %s value, right now the value is %v.", RequestId, RequestIdHeaders), nil)
//return c.SendString(fmt.Sprintf("Please provide http header %s value, right now the value is %v.", RequestId, RequestIdHeaders))
} }
} else { } else {
return ApiErrorF(c, fmt.Sprintf("Please provide http header %s .", RequestId), baseAttributes) return ApiErrorF(c, fmt.Sprintf("Please provide http header %s .", RequestId), baseAttributes)
//return c.SendString(fmt.Sprintf("Please provide http header %s .", RequestId))
} }
slogfiber.AddCustomAttributes(c, slog.String(RequestId, reqHeaders[RequestId][0])) slogfiber.AddCustomAttributes(c, slog.String(RequestId, reqHeaders[RequestId][0]))
...@@ -1101,9 +1098,6 @@ func ApiOrJWT(c *fiber.Ctx) error { ...@@ -1101,9 +1098,6 @@ func ApiOrJWT(c *fiber.Ctx) error {
slog.LogAttrs(c.UserContext(), slog.LevelInfo, "new Api or JWT reuqest", newAttributes...) slog.LogAttrs(c.UserContext(), slog.LevelInfo, "new Api or JWT reuqest", newAttributes...)
//slog.Debug("ApiAndJWT", "path", c.Route().Path)
//return c.SendString(reqHeaders["Task-Id"][0])
routePath := c.Route().Path routePath := c.Route().Path
routePathWithoutStar := strings.TrimSuffix(routePath, "/*") routePathWithoutStar := strings.TrimSuffix(routePath, "/*")
...@@ -1114,7 +1108,6 @@ func ApiOrJWT(c *fiber.Ctx) error { ...@@ -1114,7 +1108,6 @@ func ApiOrJWT(c *fiber.Ctx) error {
if uid == nil { if uid == nil {
return ApiErrorF(c, fmt.Sprintf("uid can not be nil"), baseAttributes) return ApiErrorF(c, fmt.Sprintf("uid can not be nil"), baseAttributes)
//return c.SendString(fmt.Sprintf("uid can not be nil"))
} }
if len(uid) == 0 { if len(uid) == 0 {
...@@ -1148,7 +1141,6 @@ func ApiOrJWT(c *fiber.Ctx) error { ...@@ -1148,7 +1141,6 @@ func ApiOrJWT(c *fiber.Ctx) error {
if err != nil { if err != nil {
return ApiErrorF(c, fmt.Sprintf("cache.Query %v", err.Error()), baseAttributes) return ApiErrorF(c, fmt.Sprintf("cache.Query %v", err.Error()), baseAttributes)
//return c.SendString(fmt.Sprintf("cache.Query %v", err.Error()))
} }
} else { } else {
task = replanceQueryTask task = replanceQueryTask
...@@ -1235,7 +1227,6 @@ func ApiOrJWT(c *fiber.Ctx) error { ...@@ -1235,7 +1227,6 @@ func ApiOrJWT(c *fiber.Ctx) error {
if err != nil { if err != nil {
slog.LogAttrs(context.Background(), slog.LevelError, "ApiOrJWT", append([]slog.Attr{}, slog.String("pbMarshal", err.Error()))...) slog.LogAttrs(context.Background(), slog.LevelError, "ApiOrJWT", append([]slog.Attr{}, slog.String("pbMarshal", err.Error()))...)
return ApiErrorF(c, fmt.Sprintf("pb error: %v", err.Error()), baseAttributes) return ApiErrorF(c, fmt.Sprintf("pb error: %v", err.Error()), baseAttributes)
//return c.SendString(fmt.Sprintf("pb error: %v", err.Error()))
} }
producerMessagesBytes <- bytesAndHeader{ producerMessagesBytes <- bytesAndHeader{
...@@ -1294,8 +1285,6 @@ func ApiOrJWT(c *fiber.Ctx) error { ...@@ -1294,8 +1285,6 @@ func ApiOrJWT(c *fiber.Ctx) error {
return nil return nil
//return c.SendString(pbMsg.TaskId)
} else { } else {
return syncModeF(c, pbMsg.TaskId) return syncModeF(c, pbMsg.TaskId)
} }
...@@ -1351,12 +1340,8 @@ func syncOrAsyncReturn(c *fiber.Ctx, resAsPb pbUpstream.TaskResponse, reqTaskId ...@@ -1351,12 +1340,8 @@ func syncOrAsyncReturn(c *fiber.Ctx, resAsPb pbUpstream.TaskResponse, reqTaskId
headers := make(map[string][]string) headers := make(map[string][]string)
if err := json.Unmarshal(resAsPb.TaskResultHeader, &headers); err != nil { if err := json.Unmarshal(resAsPb.TaskResultHeader, &headers); err != nil {
slog.LogAttrs(context.Background(), slog.LevelError, "syncOrAsyncReturn", append([]slog.Attr{}, slog.String("reqTaskId", reqTaskId), slog.String(TaskIdAtrr, resAsPb.TaskId), slog.String("json.Unmarshal", err.Error()))...) slog.LogAttrs(context.Background(), slog.LevelError, "syncOrAsyncReturn", append([]slog.Attr{}, slog.String("reqTaskId", reqTaskId), slog.String(TaskIdAtrr, resAsPb.TaskId), slog.String("json.Unmarshal", err.Error()))...)
return ApiErrorF(c, fmt.Sprintf("json.Unmarshal(resAsPb.TaskResultHeader error: %v", err.Error()), baseAttributes) return ApiErrorF(c, fmt.Sprintf("json.Unmarshal(resAsPb.TaskResultHeader error: %v", err.Error()), baseAttributes)
//slog.Error("syncModeF", "json.Unmarshal(resAsPb.TaskResultHeader", err.Error())
//return c.SendString(fmt.Sprintf("json.Unmarshal(resAsPb.TaskResultHeader error: %v", err.Error()))
} }
for k, vs := range headers { for k, vs := range headers {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment