- add slog

dtapps · Mar 27, 2024 · 25f92e8 · 25f92e8
1 parent 9ffd2d5
commit 25f92e8
Show file tree

Hide file tree

Showing 13 changed files with 55 additions and 56 deletions.
diff --git a/README.md b/README.md
@@ -13,5 +13,5 @@
 #### 安装
 
 ```shell
-go get -v -u go.dtapp.net/gojobs@v1.0.130
+go get -v -u go.dtapp.net/gojobs@v1.0.131
 ```
diff --git a/cron.go b/cron.go
@@ -2,9 +2,10 @@ package gojobs
 
 import (
 	"context"
+	"fmt"
 	"github.com/robfig/cron/v3"
 	"go.dtapp.net/gotime"
-	"log"
+	"log/slog"
 )
 
 type taskList struct {
@@ -95,12 +96,12 @@ func (c *Cron) List() []cron.EntryID {
 func (c *Cron) ListShow() {
 	for _, v := range c.list {
 		taskInfo := c.inner.Entry(v.id)
-		log.Printf("[ID=%v][Schedule=%v][Prev=%v][Next=%v]",
+		slog.Info(fmt.Sprintf("[ID=%v][Schedule=%v][Prev=%v][Next=%v]",
 			taskInfo.ID,
 			taskInfo.Schedule,
 			taskInfo.Prev.Format(gotime.DateTimeZhFormat),
 			taskInfo.Next.Format(gotime.DateTimeZhFormat),
-		)
+		))
 	}
 }
 
@@ -151,7 +152,7 @@ func (c *Cron) logTask(id cron.EntryID, content ...string) {
 	if c.option.log {
 		for _, v := range c.list {
 			if v.id == id {
-				log.Printf("%s [ID=%v]%s\n", v.name, id, content)
+				slog.Info(fmt.Sprintf("%s [ID=%v]%s\n", v.name, id, content))
 			}
 		}
 	}
@@ -163,20 +164,20 @@ func (c *Cron) PrintNameTask(id cron.EntryID, name string, content ...string) {
 }
 
 func (c *Cron) logNameTask(id cron.EntryID, name string, content ...string) {
-	log.Printf("%s [ID=%v]%s\n", name, id, content)
+	slog.Info(fmt.Sprintf("%s [ID=%v]%s\n", name, id, content))
 }
 
 // ListTask 任务列表
 func (c *Cron) ListTask() {
 	for _, v := range c.list {
 		taskInfo := c.inner.Entry(v.id)
-		log.Printf("%s [ID=%v][Schedule=%v][Prev=%v][Next=%v]",
+		slog.Info(fmt.Sprintf("%s [ID=%v][Schedule=%v][Prev=%v][Next=%v]",
 			v.name,
 			taskInfo.ID,
 			taskInfo.Schedule,
 			taskInfo.Prev.Format(gotime.DateTimeZhFormat),
 			taskInfo.Next.Format(gotime.DateTimeZhFormat),
-		)
+		))
 	}
 }
 

diff --git a/cron_run.go b/cron_run.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"go.dtapp.net/gotime"
-	"log"
+	"log/slog"
 	"time"
 )
 
@@ -18,7 +18,7 @@ func (c *Client) StartHandle(ctx context.Context, key any, overdue int64) error
 	err = c.redisConfig.client.Set(ctx, fmt.Sprintf("%v", key), gotime.Current().Format(), time.Duration(overdue)*time.Second).Err()
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("【%v】设置 %s", fmt.Sprintf("%v", key), err))
+			slog.Info(fmt.Sprintf("【%v】设置 %s", fmt.Sprintf("%v", key), err))
 		}
 	}
 
@@ -28,7 +28,7 @@ func (c *Client) EndHandle(ctx context.Context, key any) {
 	err := c.redisConfig.client.Del(ctx, fmt.Sprintf("%v", key)).Err()
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("【%v】删除 %s", fmt.Sprintf("%v", key), err))
+			slog.Info(fmt.Sprintf("【%v】删除 %s", fmt.Sprintf("%v", key), err))
 		}
 	}
 }
diff --git a/cron_test.go b/cron_test.go
@@ -1,7 +1,6 @@
 package gojobs
 
 import (
-	"log"
 	"testing"
 )
 
@@ -15,7 +14,6 @@ func TestCron(t *testing.T) {
 		//fmt.Println("every 2s")
 	})
 	c.Start()
-	log.Println(c.List())
 	c.AddFunc("@every 10s", func() {
 		c.ListShow()
 	})

diff --git a/go.mod b/go.mod
@@ -29,7 +29,7 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.19.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect

diff --git a/go.sum b/go.sum
@@ -46,8 +46,8 @@ github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn
 github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=

diff --git a/gorm_model_task.go b/gorm_model_task.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"go.dtapp.net/gotime"
 	"gorm.io/gorm"
-	"log"
+	"log/slog"
 	"time"
 )
 
@@ -47,7 +47,7 @@ func (c *Client) TaskTakeId(ctx context.Context, tx *gorm.DB, id uint) (result G
 		Take(&result).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("编号查询任务：%v", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("编号查询任务：%v", err))
 		}
 	}
 	return result
@@ -60,7 +60,7 @@ func (c *Client) TaskTake(ctx context.Context, tx *gorm.DB, customId string) (re
 		Take(&result).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("自定义编号查询任务：%v", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("自定义编号查询任务：%v", err))
 		}
 	}
 	return result
@@ -74,7 +74,7 @@ func (c *Client) taskTake(ctx context.Context, tx *gorm.DB, customId, status str
 		Take(&result).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("自定义编号加状态查询任务：%v", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("自定义编号加状态查询任务：%v", err))
 		}
 	}
 	return result
@@ -113,7 +113,7 @@ func (c *Client) TaskTypeTake(ctx context.Context, tx *gorm.DB, customId, Type s
 		Take(&result).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("查询单任务：%v", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("查询单任务：%v", err))
 		}
 	}
 	return result
@@ -127,7 +127,7 @@ func (c *Client) taskTypeTake(ctx context.Context, tx *gorm.DB, customId, Type,
 		Take(&result).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("查询单任务：%v", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("查询单任务：%v", err))
 		}
 	}
 	return result
@@ -166,7 +166,7 @@ func (c *Client) TaskFindAll(ctx context.Context, tx *gorm.DB, frequency int64)
 		Find(&results).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("查询多任务：%v", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("查询多任务：%v", err))
 		}
 	}
 	return results
@@ -181,7 +181,7 @@ func (c *Client) TaskFindAllType(ctx context.Context, tx *gorm.DB, Type string,
 		Find(&results).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("查询多任务：%v", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("查询多任务：%v", err))
 		}
 	}
 	return results
@@ -196,7 +196,7 @@ func (c *Client) taskFindAll(ctx context.Context, tx *gorm.DB, frequency int64,
 		Find(&results).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("查询多任务：%v", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("查询多任务：%v", err))
 		}
 	}
 	return results
@@ -212,7 +212,7 @@ func (c *Client) taskFindAllType(ctx context.Context, tx *gorm.DB, Type string,
 			Find(&results).Error
 		if err != nil {
 			if c.slog.status {
-				log.Println(fmt.Sprintf("查询多任务：%v", err))
+				slog.ErrorContext(ctx, fmt.Sprintf("查询多任务：%v", err))
 			}
 		}
 		return results
@@ -225,7 +225,7 @@ func (c *Client) taskFindAllType(ctx context.Context, tx *gorm.DB, Type string,
 		Find(&results).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("查询多任务：%v", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("查询多任务：%v", err))
 		}
 	}
 	return results
@@ -291,7 +291,7 @@ func (c *Client) StartTask(ctx context.Context, tx *gorm.DB, id uint) error {
 		}).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("任务启动失败：%v", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("任务启动失败：%v", err))
 		}
 	}
 	return err
@@ -310,7 +310,7 @@ func (c *Client) StartTaskCustom(ctx context.Context, tx *gorm.DB, customId stri
 		}).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("任务启动自定义失败：%v", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("任务启动自定义失败：%v", err))
 		}
 	}
 	return err
@@ -332,7 +332,7 @@ func (c *Client) UpdateFrequency(ctx context.Context, tx *gorm.DB, id uint, freq
 		}).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("更新任务频率失败：%v", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("更新任务频率失败：%v", err))
 		}
 	}
 	return err

diff --git a/gorm_model_task_log.go b/gorm_model_task_log.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"go.dtapp.net/gotime"
-	"log"
+	"log/slog"
 	"time"
 )
 
@@ -40,7 +40,7 @@ func (c *Client) GormTaskLogDelete(ctx context.Context, hour int64) error {
 		Delete(&GormModelTaskLog{}).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("删除失败：%s", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("删除失败：%s", err))
 		}
 	}
 	return err
@@ -56,7 +56,7 @@ func (c *Client) GormTaskLogInDelete(ctx context.Context, hour int64) error {
 		Delete(&GormModelTaskLog{}).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("删除失败：%s", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("删除失败：%s", err))
 		}
 	}
 	return err
@@ -72,7 +72,7 @@ func (c *Client) GormTaskLogSuccessDelete(ctx context.Context, hour int64) error
 		Delete(&GormModelTaskLog{}).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("删除失败：%s", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("删除失败：%s", err))
 		}
 	}
 	return err
@@ -88,7 +88,7 @@ func (c *Client) GormTaskLogErrorDelete(ctx context.Context, hour int64) error {
 		Delete(&GormModelTaskLog{}).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("删除失败：%s", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("删除失败：%s", err))
 		}
 	}
 	return err
@@ -104,7 +104,7 @@ func (c *Client) GormTaskLogTimeoutDelete(ctx context.Context, hour int64) error
 		Delete(&GormModelTaskLog{}).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("删除失败：%s", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("删除失败：%s", err))
 		}
 	}
 	return err
@@ -121,7 +121,7 @@ func (c *Client) GormTaskLogWaitDelete(ctx context.Context, hour int64) error {
 		Delete(&GormModelTaskLog{}).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("删除失败：%s", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("删除失败：%s", err))
 		}
 	}
 	return err
@@ -141,10 +141,10 @@ func (c *Client) GormTaskLogRecord(ctx context.Context, task GormModelTask, runI
 		Create(&taskLog).Error
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("记录失败：%s", err))
+			slog.ErrorContext(ctx, fmt.Sprintf("记录失败：%s", err))
 		}
 		if c.slog.status {
-			log.Println(fmt.Sprintf("记录数据：%+v", taskLog))
+			slog.ErrorContext(ctx, fmt.Sprintf("记录数据：%+v", taskLog))
 		}
 	}
 }
diff --git a/print.go b/print.go
@@ -2,13 +2,13 @@ package gojobs
 
 import (
 	"context"
-	"log"
+	"log/slog"
 )
 
 func (c *Client) Println(ctx context.Context, isPrint bool, v ...any) {
 	if isPrint {
 		if c.slog.status {
-			log.Println(v...)
+			slog.InfoContext(ctx, "", v...)
 		}
 	}
 }
diff --git a/redis.go b/redis.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/redis/go-redis/v9"
-	"log"
+	"log/slog"
 )
 
 // Publish 发布
@@ -15,7 +15,7 @@ func (c *Client) Publish(ctx context.Context, channel string, message interface{
 	publish, err := c.redisConfig.client.Publish(ctx, channel, message).Result()
 	if err != nil {
 		if c.slog.status {
-			log.Println(fmt.Sprintf("发布失败：%s %s %v %s", channel, message, publish, err))
+			slog.Info(fmt.Sprintf("发布失败：%s %s %v %s", channel, message, publish, err))
 		}
 	}
 	return err