From 894d5f3b8581e71f2e98707368b7bfa601ca27f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?=
Date: Fri, 8 Sep 2023 14:27:21 +0800
Subject: [PATCH] - update jobs
---
utils/gojobs/gorm_model.go | 27 ++++++++++++++-------------
utils/gojobs/redis_get.go | 8 ++++----
utils/gojobs/run.go | 10 +++++-----
3 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/utils/gojobs/gorm_model.go b/utils/gojobs/gorm_model.go
index 34490cb4..4ed0cb6f 100644
--- a/utils/gojobs/gorm_model.go
+++ b/utils/gojobs/gorm_model.go
@@ -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
diff --git a/utils/gojobs/redis_get.go b/utils/gojobs/redis_get.go
index 50ccc605..fe054429 100644
--- a/utils/gojobs/redis_get.go
+++ b/utils/gojobs/redis_get.go
@@ -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))
}
}
diff --git a/utils/gojobs/run.go b/utils/gojobs/run.go
index 1cefc4ac..dece404c 100644
--- a/utils/gojobs/run.go
+++ b/utils/gojobs/run.go
@@ -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))
}
}
}