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

- update jobs

Browse Source
master
李光春 8 months ago
parent a2f67b40aa
commit 894d5f3b85
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File

27
utils/gojobs/gorm_model.go
Unescape View File

@ -2,6 +2,7 @@ package gojobs
import ( import (
"context" "context"
"fmt"
"github.com/dtapps/go-library/utils/gojobs/jobs_gorm_model" "github.com/dtapps/go-library/utils/gojobs/jobs_gorm_model"
"github.com/dtapps/go-library/utils/gotime" "github.com/dtapps/go-library/utils/gotime"
"gorm.io/gorm" "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 err := tx.Where("id = ?", id).Take(&result).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("编号查询任务：%v", err) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("编号查询任务：%v", err))
} }
} }
return result 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 err := tx.Where("custom_id = ?", customId).Take(&result).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("自定义编号查询任务：%v", err) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("自定义编号查询任务：%v", err))
} }
} }
return result 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 err := tx.Where("custom_id = ?", customId).Where("status = ?", status).Take(&result).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("自定义编号加状态查询任务：%v", err) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("自定义编号加状态查询任务：%v", err))
} }
} }
return result 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 err := tx.Where("custom_id = ?", customId).Where("type = ?", Type).Take(&result).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("查询单任务：%v", err) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("查询单任务：%v", err))
} }
} }
return result 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 err := tx.Where("custom_id = ?", customId).Where("type = ?", Type).Where("status = ?", status).Take(&result).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("查询单任务：%v", err) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("查询单任务：%v", err))
} }
} }
return result 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 err := tx.Where("frequency = ?", frequency).Order("id asc").Find(&results).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("查询多任务：%v", err) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("查询多任务：%v", err))
} }
} }
return results 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 err := tx.Where("type = ?", Type).Where("frequency = ?", frequency).Order("id asc").Find(&results).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("查询多任务：%v", err) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("查询多任务：%v", err))
} }
} }
return results 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 err := tx.Where("frequency = ?", frequency).Where("status = ?", status).Order("id asc").Find(&results).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("查询多任务：%v", err) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("查询多任务：%v", err))
} }
} }
return results 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 err := tx.Where("type = ?", Type).Where("status = ?", status).Order("id asc").Find(&results).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("查询多任务：%v", err) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("查询多任务：%v", err))
} }
} }
return results 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 err := tx.Where("type = ?", Type).Where("frequency = ?", frequency).Where("status = ?", status).Order("id asc").Find(&results).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("查询多任务：%v", err) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("查询多任务：%v", err))
} }
} }
return results return results
@ -225,7 +226,7 @@ func (c *Client) StartTask(ctx context.Context, tx *gorm.DB, id uint) error {
}).Error }).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("任务启动失败：%v", err) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("任务启动失败：%v", err))
} }
} }
return err return err
@ -244,7 +245,7 @@ func (c *Client) StartTaskCustom(ctx context.Context, tx *gorm.DB, customId stri
}).Error }).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("任务启动自定义失败：%v", err) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("任务启动自定义失败：%v", err))
} }
} }
return err return err
@ -265,7 +266,7 @@ func (c *Client) UpdateFrequency(ctx context.Context, tx *gorm.DB, id uint, freq
}).Error }).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("更新任务频率失败：%v", err) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("更新任务频率失败：%v", err))
} }
} }
return 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执行 // 判断是否指定某ip执行
if gostring.Contains(workers[0], currentIp) { if gostring.Contains(workers[0], currentIp) {
if c.slog.status { 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 return workers[0], nil
} }
@ -53,7 +53,7 @@ func (c *Client) GetIssueAddress(ctx context.Context, workers []string, v *jobs_
for wk, wv := range workers { for wk, wv := range workers {
if gostring.Contains(wv, currentIp) { if gostring.Contains(wv, currentIp) {
if c.slog.status { 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 return workers[wk], nil
} }
@ -66,7 +66,7 @@ func (c *Client) GetIssueAddress(ctx context.Context, workers []string, v *jobs_
return address, errors.New("获取执行的客户端异常") return address, errors.New("获取执行的客户端异常")
} }
if c.slog.status { 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 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() client, err = c.cache.redisClient.PubSubChannels(ctx, c.cache.cornKeyPrefix+"_*").Result()
if err != nil { if err != nil {
if c.slog.status { 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 }).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("保存失败：%s", err.Error()) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("保存失败：%s", err))
} }
} }
return return
@ -114,7 +114,7 @@ func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultC
}).Error }).Error
if err != nil { if err != nil {
if c.slog.status { 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: case CodeEnd:
@ -131,7 +131,7 @@ func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultC
}).Error }).Error
if err != nil { if err != nil {
if c.slog.status { 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: case CodeError:
@ -148,7 +148,7 @@ func (c *Client) Run(ctx context.Context, task jobs_gorm_model.Task, taskResultC
}).Error }).Error
if err != nil { if err != nil {
if c.slog.status { 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 }).Error
if err != nil { if err != nil {
if c.slog.status { if c.slog.status {
c.slog.client.WithTraceId(ctx).Errorf("保存失败：%s", err.Error()) c.slog.client.WithTraceId(ctx).Error(fmt.Sprintf("保存失败：%s", err))
} }
} }
} }

Write Preview
Loading…
Cancel
Save