Commit 34bd4511 authored by Your Name's avatar Your Name

add log level param

parent 2b13f8d6
...@@ -430,11 +430,6 @@ var withBillDb bool ...@@ -430,11 +430,6 @@ var withBillDb bool
func main() { func main() {
slog.SetDefault(slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{
Level: slog.LevelDebug,
//AddSource: true,
})))
var questAddr, kafkaBroker, callbackAddrP, listenIpPort, aigcProduceTopic, aigcConsumerTopic string var questAddr, kafkaBroker, callbackAddrP, listenIpPort, aigcProduceTopic, aigcConsumerTopic string
var redisAddr, redisPassWd, mysqlAddr string var redisAddr, redisPassWd, mysqlAddr string
...@@ -442,6 +437,8 @@ func main() { ...@@ -442,6 +437,8 @@ func main() {
var mysqlDbName, mysqlUser, mysqlPassWd string var mysqlDbName, mysqlUser, mysqlPassWd string
var logLevel int
//var redisPassWd string //var redisPassWd string
//flag.StringVar(&questAddr, "questAddr", "192.168.1.10:9009", "questDbAddr") //flag.StringVar(&questAddr, "questAddr", "192.168.1.10:9009", "questDbAddr")
...@@ -463,8 +460,20 @@ func main() { ...@@ -463,8 +460,20 @@ func main() {
flag.BoolVar(&withBillDb, "withbilldb", true, "enable with bill db, or simulate") flag.BoolVar(&withBillDb, "withbilldb", true, "enable with bill db, or simulate")
flag.IntVar(&logLevel, "loglevel", 0, "log level,default is debug,LevelDebug Level = -4 LevelInfo Level = 0 LevelWarn Level = 4 LevelError Level = 8 ")
flag.Parse() flag.Parse()
levelVar := &slog.LevelVar{}
levelVar.Set(slog.Level(logLevel))
slog.Info("log level", "level", levelVar.String())
slog.SetDefault(slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{
Level: levelVar,
//AddSource: true,
})))
slog.Warn("start param", "quest", slog.GroupValue(slog.String("Addr", questAddr))) slog.Warn("start param", "quest", slog.GroupValue(slog.String("Addr", questAddr)))
slog.Warn("start param", "kafka", slog.GroupValue(slog.String("Addr", kafkaBroker)), slog.Group("topic", "aigcProduceTopic", aigcProduceTopic, "aigcConsumerTopic", aigcConsumerTopic)) slog.Warn("start param", "kafka", slog.GroupValue(slog.String("Addr", kafkaBroker)), slog.Group("topic", "aigcProduceTopic", aigcProduceTopic, "aigcConsumerTopic", aigcConsumerTopic))
slog.Warn("start param", "callback", slog.GroupValue(slog.String("Addr", callbackAddrP))) slog.Warn("start param", "callback", slog.GroupValue(slog.String("Addr", callbackAddrP)))
...@@ -576,14 +585,15 @@ func ApiAndJWT(c *fiber.Ctx) error { ...@@ -576,14 +585,15 @@ func ApiAndJWT(c *fiber.Ctx) error {
slog.Debug("ApiAndJWT", "path", c.Route().Path) slog.Debug("ApiAndJWT", "path", c.Route().Path)
reqHeaders := c.GetReqHeaders()
return c.SendString(reqHeaders["Task-Id"][0])
routePath := c.Route().Path routePath := c.Route().Path
routePathWithoutStar := strings.TrimSuffix(routePath, "/*") routePathWithoutStar := strings.TrimSuffix(routePath, "/*")
path := c.Path() path := c.Path()
pathInDB := strings.TrimPrefix(path, routePathWithoutStar) pathInDB := strings.TrimPrefix(path, routePathWithoutStar)
reqHeaders := c.GetReqHeaders()
uid := reqHeaders["X-Consumer-Custom-Id"] uid := reqHeaders["X-Consumer-Custom-Id"]
if uid == nil { if uid == nil {
...@@ -630,14 +640,19 @@ func ApiAndJWT(c *fiber.Ctx) error { ...@@ -630,14 +640,19 @@ func ApiAndJWT(c *fiber.Ctx) error {
ContainerPubkey: []byte(task.PublicKey), ContainerPubkey: []byte(task.PublicKey),
} }
msgAsJson, err := json.Marshal(pbMsg) slog.Debug("msg to kafka",
"TaskId", pbMsg.TaskId,
if err != nil { "TaskType", pbMsg.TaskType,
slog.Error("pbUpstream.TaskContent", "Marshal", err.Error()) "TaskKind", pbMsg.TaskKind,
return c.SendString(fmt.Sprintf("json.Marshal %v", err.Error())) "TaskCmd", pbMsg.TaskCmd,
} "TaskParam", pbMsg.TaskParam,
"TaskTimestamp", pbMsg.TaskTimestamp,
slog.Debug("msgAsJson to kafka", "asjson", string(msgAsJson)) "TaskCallback", pbMsg.TaskCallback,
"TaskUid", pbMsg.TaskUid,
"TaskFee", pbMsg.TaskFee,
"TaskInLen", pbMsg.TaskInLen,
"TaskWorkload", pbMsg.TaskWorkload,
"ContainerPubkey", pbMsg.ContainerPubkey)
pbBytes, err := gogoPbProto.Marshal(&pbMsg) pbBytes, err := gogoPbProto.Marshal(&pbMsg)
...@@ -674,7 +689,11 @@ func ApiAndJWT(c *fiber.Ctx) error { ...@@ -674,7 +689,11 @@ func ApiAndJWT(c *fiber.Ctx) error {
if asyncMode { if asyncMode {
time.Sleep(10 * time.Second) time.Sleep(10 * time.Second)
return c.SendString(pbMsg.TaskId)
m := make([]byte, 1024*1024)
return c.SendString(string(m))
//return c.SendString(pbMsg.TaskId)
} else { } else {
return syncModeF(c, pbMsg.TaskId) return syncModeF(c, pbMsg.TaskId)
......
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