dtapps
/
go-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases 40 Wiki Activity

Compare commits

base: dtapps:a2f67b40aa1f0c1d1be74b777818952e8edacba8
Branches Tags
dtapps:master
...
compare: dtapps:7547e8251cdab5db07743b98fef44d0a0ceccddd
Branches Tags
dtapps:master

2 Commits
a2f67b40aa ... 7547e8251c

Author SHA1 Message Date
李光春 7547e8251c - update log
8 months ago
李光春 894d5f3b85 - update jobs
8 months ago
4 changed files with 32 additions and 107 deletions
Show Stats

27
utils/gojobs/gorm_model.go
Unescape View File

@ -2,6 +2,7 @@ package gojobs
import (
"context"
"fmt"
"github.com/dtapps/go-library/utils/gojobs/jobs_gorm_model"
"github.com/dtapps/go-library/utils/gotime"
"gorm.io/gorm"
@ -12,7 +13,7 @@ func (c *Client) TaskTakeId(ctx context.Context, tx *gorm.DB, id uint) (result j
err := tx.Where("id = ?", id).Take(&result).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("编号查询任务：%v", err)
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("编号查询任务：%v", err))
}
}
return result
@ -23,7 +24,7 @@ func (c *Client) TaskTake(ctx context.Context, tx *gorm.DB, customId string) (re
err := tx.Where("custom_id = ?", customId).Take(&result).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("自定义编号查询任务：%v", err)
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("自定义编号查询任务：%v", err))
}
}
return result
@ -34,7 +35,7 @@ func (c *Client) taskTake(ctx context.Context, tx *gorm.DB, customId, status str
err := tx.Where("custom_id = ?", customId).Where("status = ?", status).Take(&result).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("自定义编号加状态查询任务：%v", err)
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("自定义编号加状态查询任务：%v", err))
}
}
return result
@ -70,7 +71,7 @@ func (c *Client) TaskTypeTake(ctx context.Context, tx *gorm.DB, customId, Type s
err := tx.Where("custom_id = ?", customId).Where("type = ?", Type).Take(&result).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("查询单任务：%v", err)
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("查询单任务：%v", err))
}
}
return result
@ -81,7 +82,7 @@ func (c *Client) taskTypeTake(ctx context.Context, tx *gorm.DB, customId, Type,
err := tx.Where("custom_id = ?", customId).Where("type = ?", Type).Where("status = ?", status).Take(&result).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("查询单任务：%v", err)
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("查询单任务：%v", err))
}
}
return result
@ -117,7 +118,7 @@ func (c *Client) TaskFindAll(ctx context.Context, tx *gorm.DB, frequency int64)
err := tx.Where("frequency = ?", frequency).Order("id asc").Find(&results).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("查询多任务：%v", err)
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("查询多任务：%v", err))
}
}
return results
@ -128,7 +129,7 @@ func (c *Client) TaskFindAllType(ctx context.Context, tx *gorm.DB, Type string,
err := tx.Where("type = ?", Type).Where("frequency = ?", frequency).Order("id asc").Find(&results).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("查询多任务：%v", err)
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("查询多任务：%v", err))
}
}
return results
@ -139,7 +140,7 @@ func (c *Client) taskFindAll(ctx context.Context, tx *gorm.DB, frequency int64,
err := tx.Where("frequency = ?", frequency).Where("status = ?", status).Order("id asc").Find(&results).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("查询多任务：%v", err)
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("查询多任务：%v", err))
}
}
return results
@ -151,7 +152,7 @@ func (c *Client) taskFindAllType(ctx context.Context, tx *gorm.DB, Type string,
err := tx.Where("type = ?", Type).Where("status = ?", status).Order("id asc").Find(&results).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("查询多任务：%v", err)
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("查询多任务：%v", err))
}
}
return results
@ -159,7 +160,7 @@ func (c *Client) taskFindAllType(ctx context.Context, tx *gorm.DB, Type string,
err := tx.Where("type = ?", Type).Where("frequency = ?", frequency).Where("status = ?", status).Order("id asc").Find(&results).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("查询多任务：%v", err)
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("查询多任务：%v", err))
}
}
return results
@ -225,7 +226,7 @@ func (c *Client) StartTask(ctx context.Context, tx *gorm.DB, id uint) error {
}).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("任务启动失败：%v", err)
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("任务启动失败：%v", err))
}
}
return err
@ -244,7 +245,7 @@ func (c *Client) StartTaskCustom(ctx context.Context, tx *gorm.DB, customId stri
}).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("任务启动自定义失败：%v", err)
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("任务启动自定义失败：%v", err))
}
}
return err
@ -265,7 +266,7 @@ func (c *Client) UpdateFrequency(ctx context.Context, tx *gorm.DB, id uint, freq
}).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("更新任务频率失败：%v", err)
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("更新任务频率失败：%v", err))
}
}
return err

8
utils/gojobs/redis_get.go
Unescape View File

@ -39,7 +39,7 @@ func (c *Client) GetIssueAddress(ctx context.Context, workers []string, v *jobs_
// 判断是否指定某ip执行
if gostring.Contains(workers[0], currentIp) {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Infof("只有一个客户端在线，指定某ip执行：", workers[0], currentIp)
c.slog.client.WithTraceId(ctx).Info(fmt.Sprintf("只有一个客户端在线，指定某ip执行：%v %v", workers[0], currentIp))
}
return workers[0], nil
}
@ -53,7 +53,7 @@ func (c *Client) GetIssueAddress(ctx context.Context, workers []string, v *jobs_
for wk, wv := range workers {
if gostring.Contains(wv, currentIp) {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Infof("优先处理指定某ip执行：", workers[wk], currentIp)
c.slog.client.WithTraceId(ctx).Info(fmt.Sprintf("优先处理指定某ip执行：%v %v", workers[wk], currentIp))
}
return workers[wk], nil
}
@ -66,7 +66,7 @@ func (c *Client) GetIssueAddress(ctx context.Context, workers []string, v *jobs_
return address, errors.New("获取执行的客户端异常")
}
if c.slog.status {
c.slog.client.WithTraceId(ctx).Infof("随机返回一个：", address, currentIp)
c.slog.client.WithTraceId(ctx).Info(fmt.Sprintf("随机返回一个：%v %v", address, currentIp))
}
return address, nil
}
@ -79,7 +79,7 @@ func (c *Client) GetSubscribeClientList(ctx context.Context) (client []string, e
client, err = c.cache.redisClient.PubSubChannels(ctx, c.cache.cornKeyPrefix+"_*").Result()
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("获取在线的客户端失败：%s，%v", c.cache.cornKeyPrefix+"_*", err)
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("获取在线的客户端失败：%s，%v", c.cache.cornKeyPrefix+"_*", err))
}
}

10
utils/gojobs/run.go
Unescape View File

@ -96,7 +96,7 @@ func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultC
}).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("保存失败：%s", err.Error())
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("保存失败：%s", err))
}
}
return
@ -114,7 +114,7 @@ func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultC
}).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("保存失败：%s", err.Error())
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("保存失败：%s", err))
}
}
case CodeEnd:
@ -131,7 +131,7 @@ func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultC
}).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("保存失败：%s", err.Error())
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("保存失败：%s", err))
}
}
case CodeError:
@ -148,7 +148,7 @@ func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultC
}).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("保存失败：%s", err.Error())
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("保存失败：%s", err))
}
}
}
@ -163,7 +163,7 @@ func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultC
}).Error
if err != nil {
if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("保存失败：%s", err.Error())
c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("保存失败：%s", err))
}
}
}

94
utils/golog/slog.go
Unescape View File

@ -2,7 +2,6 @@ package golog
import (
"context"
"fmt"
"github.com/dtapps/go-library/utils/gotime"
"github.com/dtapps/go-library/utils/gotrace_id"
"gopkg.in/natefinch/lumberjack.v2"
@ -93,121 +92,46 @@ func NewSlog(ctx context.Context, config *SLogConfig) *SLog {
}
// WithLogger 跟踪编号
func (sl *SLog) WithLogger() *LoggerOperation {
func (sl *SLog) WithLogger() *slog.Logger {
if sl.config.JsonFormat {
logger := slog.New(sl.jsonHandler)
return &LoggerOperation{
logger: logger,
}
return logger
} else {
logger := slog.New(sl.textHandler)
return &LoggerOperation{
logger: logger,
}
return logger
}
}
// WithTraceId 跟踪编号
func (sl *SLog) WithTraceId(ctx context.Context) *LoggerOperation {
func (sl *SLog) WithTraceId(ctx context.Context) *slog.Logger {
if sl.config.JsonFormat {
jsonHandler := sl.jsonHandler.WithAttrs([]slog.Attr{
slog.String("trace_id", gotrace_id.GetTraceIdContext(ctx)),
})
logger := slog.New(jsonHandler)
return &LoggerOperation{
logger: logger,
}
return logger
} else {
textHandler := sl.textHandler.WithAttrs([]slog.Attr{
slog.String("trace_id", gotrace_id.GetTraceIdContext(ctx)),
})
logger := slog.New(textHandler)
return &LoggerOperation{
logger: logger,
}
return logger
}
}
// WithTraceIdStr 跟踪编号
func (sl *SLog) WithTraceIdStr(traceId string) *LoggerOperation {
func (sl *SLog) WithTraceIdStr(traceId string) *slog.Logger {
if sl.config.JsonFormat {
jsonHandler := sl.jsonHandler.WithAttrs([]slog.Attr{
slog.String("trace_id", traceId),
})
logger := slog.New(jsonHandler)
return &LoggerOperation{
logger: logger,
}
return logger
} else {
textHandler := sl.textHandler.WithAttrs([]slog.Attr{
slog.String("trace_id", traceId),
})
logger := slog.New(textHandler)
return &LoggerOperation{
logger: logger,
}
return logger
}
}
type LoggerOperation struct {
logger *slog.Logger
}
// Debug logs at LevelDebug.
func (l *LoggerOperation) Debug(msg any) {
l.logger.Debug(fmt.Sprintf("%v", msg))
}
// Debugf formats the message according to the format specifier
func (l *LoggerOperation) Debugf(template string, args ...any) {
l.logger.Debug(fmt.Sprintf(template, args...))
}
// DebugContext logs at LevelDebug with the given context.
func (l *LoggerOperation) DebugContext(ctx context.Context, msg string, args ...any) {
l.logger.DebugContext(ctx, msg, args...)
}
// Info logs at LevelInfo.
func (l *LoggerOperation) Info(msg any) {
l.logger.Info(fmt.Sprintf("%v", msg))
}
// Infof formats the message according to the format specifier
func (l *LoggerOperation) Infof(template string, args ...any) {
l.logger.Info(fmt.Sprintf(template, args...))
}
// InfoContext logs at LevelInfo with the given context.
func (l *LoggerOperation) InfoContext(ctx context.Context, msg string, args ...any) {
l.logger.InfoContext(ctx, msg, args...)
}
// Warn logs at LevelWarn.
func (l *LoggerOperation) Warn(msg any) {
l.logger.Warn(fmt.Sprintf("%v", msg))
}
// Warnf formats the message according to the format specifier
func (l *LoggerOperation) Warnf(template string, args ...any) {
l.logger.Warn(fmt.Sprintf(template, args...))
}
func (l *LoggerOperation) WarnContext(ctx context.Context, msg string, args ...any) {
l.logger.WarnContext(ctx, msg, args...)
}
// Error logs at LevelError.
func (l *LoggerOperation) Error(msg any) {
l.logger.Error(fmt.Sprintf("%v", msg))
}
// Errorf formats the message according to the format specifier
func (l *LoggerOperation) Errorf(template string, args ...any) {
l.logger.Error(fmt.Sprintf(template, args...))
}
// ErrorContext logs at LevelError with the given context.
func (l *LoggerOperation) ErrorContext(ctx context.Context, msg string, args ...any) {
l.logger.ErrorContext(ctx, msg, args...)
}

Write Preview
Loading…
Cancel
Save